8-24

api/index.js

@@ -33,4 +33,19 @@ export function loadIndexs(data) {
 		data
 	});
 }
-
+//获取文章列表
+export function article(data,id) {
+	return request({
+		url: '/api/article/list/' + id,
+		method: 'get',
+		data
+	});
+}
+//获取文章详情
+export function details(data,id) {
+        return request({
+                url: '/api/article/details/'+id,
+                method: 'GET',
+                data
+        });
+}

manifest.json

@@ -73,7 +73,8 @@
         "devServer" : {
             "proxy" : {
                 "/api" : {
-                    "target" : "http://jf.frp.liuniu946.com/api",
+                    // "target" : "http://jf.frp.liuniu946.com/api",
+					"target": "http://www.wyrxs.com/api",
                     // "changeOrigin": true,
                     "pathRewrite" : {
                         "/api" : "" // rewrite path

pages.json

@@ -235,13 +235,19 @@
 		{
 			"path": "pages/user/withdmoenys",
 			"style": {
-				"navigationBarTitleText": "积分转账"
+				"navigationBarTitleText": "积分转账",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+				
 			}
 		},
 		{
 			"path": "pages/user/extension",
 			"style": {
-				"navigationBarTitleText": "我的团队",
+				"navigationBarTitleText": "我的粉丝",
 				"app-plus": {
 					"titleNView": {
 						"type": "transparent"
@@ -333,7 +339,7 @@
 		{
 			"path": "pages/money/wallet",
 			"style": {
-				"navigationBarTitleText": "我的钱包",
+				"navigationBarTitleText": "我的积分",
 				"app-plus": {
 					"titleNView": {
 						"type": "transparent"
@@ -397,6 +403,18 @@
 			"style": {
 				"navigationBarTitleText": "邀请好友"
 			}
+		},
+		{
+			"path": "pages/user/addmenDetail",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/user/addmen",
+			"style": {
+				"navigationBarTitleText": ""
+			}
 		}
 	],
 	"globalStyle": {
@@ -416,12 +434,12 @@
 				"selectedIconPath": "static/tabBar/tab-home-current.png",
 				"text": "首页"
 			},
-			{
-				"pagePath": "pages/category/category",
-				"iconPath": "static/tabBar/tab-cate.png",
-				"selectedIconPath": "static/tabBar/tab-cate-current.png",
-				"text": "分类"
-			},
+			// {
+			// 	"pagePath": "pages/category/category",
+			// 	"iconPath": "static/tabBar/tab-cate.png",
+			// 	"selectedIconPath": "static/tabBar/tab-cate-current.png",
+			// 	"text": "分类"
+			// },
 			{
 				"pagePath": "pages/user/user",
 				"iconPath": "static/tabBar/tab-my.png",

pages/index/index.vue

@@ -4,14 +4,32 @@
 		<view class="carousel-section">
 			<!-- 标题栏和状态栏占位符 -->
 			<view class="titleNview-placing"></view>
-			<swiper class="carousel" autoplay="true" duration="400" interval="5000" >
+			<swiper class="carousel" autoplay="true" duration="400" interval="5000">
 				<swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item" @click="bannerNavToUrl(item)"><image :src="item.pic" /></swiper-item>
 			</swiper>
 		</view>
-		<u-tabs :list="typeList" active-color="#4E6CFF"   name='name' bg-color='transparent' :current="typeIndex" @change="changeType"></u-tabs>
-		<swiper class="list-box" @change="listChange" :style="{ height: swiperHeight + 'px' }" :current="typeIndex" >
+		<view class="tongz flex">
+			<view>
+				<view class="tongz-bg"><image src="../../static/img/xtxx.png" mode=""></image></view>
+				<view class="tongz-left flex">
+					<image class="image-left" src="../../static/icon/ld.png" mode=""></image>
+					<u-notice-bar
+						style="width: 100%;"
+						mode="vertical"
+						type="none"
+						:volume-icon="false"
+						:more-icon="true"
+						:list="showTitle"
+						@click="goDetails"
+						@getMore="nav('/pages/user/addmen?id=2')"
+					></u-notice-bar>
+				</view>
+			</view>
+		</view>
+		<u-tabs :list="typeList" active-color="#4E6CFF" name="name" bg-color="transparent" :current="typeIndex" @change="changeType"></u-tabs>
+		<swiper class="list-box" @change="listChange" :style="{ height: swiperHeight + 'px' }" :current="typeIndex">
 			<swiper-item v-for="ls in typeList">
-				<view class="guess-section">
+				<!-- <view class="guess-section">
 					<view v-for="(item, index) in ls.list" :key="index" class="guess-item" @click="navToDetailPage(item)">
 						<view class="image-wrapper"><image :src="item.image" mode="scaleToFill"></image></view>
 						<text class="title clamp2 margin-c-20">{{ item.store_name }}</text>
@@ -26,6 +44,19 @@
 							</view>
 						</view>
 					</view>
+				</view> -->
+				<view class="good-wrapper">
+					<view class="good" v-for="(item, index) in ls.list" :key="index" @click="navToDetailPage(item)">
+						<view class="image-wrapper"><image :src="item.image" mode="scaleToFill"></image></view>
+						<view class="good-info">
+							<view class="info-title clamp2">
+								{{item.store_name}}
+							</view>
+							<view class="info-price">
+								<image class="jff" src="../../static/icon/iconU1.png" mode="widthFix"></image>{{item.price}}
+							</view>
+						</view>
+					</view>
 				</view>
 				<u-loadmore :status="ls.load" />
 			</swiper-item>
@@ -34,11 +65,11 @@
 </template>
 
 <script>
-import { loadIndexs } from '@/api/index.js';
+import { loadIndexs, article } from '@/api/index.js';
 import { getUserInfo } from '@/api/user.js';
 import { interceptor } from '@/utils/loginUtils';
 import { mapState } from 'vuex';
-import { getCategoryList, getProducts} from '@/api/product.js';
+import { getCategoryList, getProducts } from '@/api/product.js';
 
 export default {
 	data() {
@@ -46,20 +77,20 @@ export default {
 			shareShow: false, //分享海报
 			pageProportion: 0, //保存页面基于750宽度的比例
 			swiperHeight: 0,
-			swiperLength:0,
+			swiperLength: 0,
 			carouselList: [], //轮播列表
 			page: 1,
 			limit: 5,
 			// 商品分类数据
-			typeList:[{
-				
-			}],
+			typeList: [{}],
 			//保存当前选中的分类
-			typeIndex:0
+			typeIndex: 0,
+			showList: [],
+			showTitle: []
 		};
 	},
 	computed: {
-		...mapState('user', ['hasLogin','userInfo'])
+		...mapState('user', ['hasLogin', 'userInfo'])
 	},
 	onLoad: function(option) {
 		// #ifndef MP
@@ -69,6 +100,7 @@ export default {
 		}
 		// #endif
 		this.init();
+		this.getShowList()
 	},
 	//下拉刷新
 	onPullDownRefresh() {
@@ -81,12 +113,12 @@ export default {
 		this.clickSearch();
 	},
 	// #endif
-	onReachBottom(){
-		this.getProducts(this.typeList[this.typeIndex])
+	onReachBottom() {
+		this.getProducts(this.typeList[this.typeIndex]);
 	},
 	methods: {
 		// 初始化页面数据
-		init(){
+		init() {
 			this.loadData();
 			// 获取分类
 			this.getType();
@@ -94,7 +126,7 @@ export default {
 			this.getBl();
 		},
 		// 获取初始化页面比例
-		getBl(){
+		getBl() {
 			let obj = this;
 			obj.$nextTick(function() {
 				uni.createSelectorQuery()
@@ -111,29 +143,30 @@ export default {
 			});
 		},
 		// 设置切换高度
-		getlistHeight(item){
+		getlistHeight(item) {
 			let obj = this;
 			let bHeight = Math.ceil(item.length / 2);
-			obj.swiperHeight = Math.ceil(obj.pageProportion * 520 * bHeight+30);
+			obj.swiperHeight = Math.ceil(obj.pageProportion * 520 * bHeight + 30);
 		},
 		// tabs切换
-		changeType(e){
-			console.log(e,'dianji');
+		changeType(e) {
+			console.log(e, 'dianji');
+			console.log(this.typeList[e])
 			this.typeIndex = e;
 			// 判断是否已经加载过数据
-			const item = this.typeList[this.typeIndex]
-			if(!item.loding){
-				this.getProducts(item)
+			const item = this.typeList[this.typeIndex];
+			if (!item.loding) {
+				this.getProducts(item);
 			}
 		},
 		// sw切换
-		listChange(e){
-			if(e.detail.current!=this.typeIndex){
-				this.typeIndex=e.detail.current;
+		listChange(e) {
+			if (e.detail.current != this.typeIndex) {
+				this.typeIndex = e.detail.current;
 				// 判断是否已经加载过数据
-				const item = this.typeList[this.typeIndex]
-				if(!item.loding){
-					this.getProducts(item)
+				const item = this.typeList[this.typeIndex];
+				if (!item.loding) {
+					this.getProducts(item);
 				}
 			}
 		},
@@ -146,61 +179,63 @@ export default {
 			});
 		},
 		// 获取商品分类
-		getType(){
+		getType() {
 			const obj = this;
 			getCategoryList({})
 				.then(({ data }) => {
 					obj.typeList = data.map(function(s) {
 						return {
-							name:s.cate_name,
-							id:s.id,
-							page:1,
-							limit:10,
-							list:[],
-							load:'loadmore',//loadmore/loading / nomore
-							isLoding:false//用于判断是否已经载入过分类
+							name: s.cate_name,
+							id: s.id,
+							page: 1,
+							limit: 10,
+							list: [],
+							load: 'loadmore', //loadmore/loading / nomore
+							isLoding: false //用于判断是否已经载入过分类
 						};
 					});
 					// 加载商品
-					obj.getProducts(this.typeList[this.typeIndex])
+					obj.getProducts(this.typeList[this.typeIndex]);
 				})
 				.catch(err => {
 					console.log(err);
 				});
 		},
 		// 获取商品信息
-		getProducts(item){
+		getProducts(item) {
 			// 判断是否已经没有数据
-			if(item.load=='nomore'){
-				return ;
+			if (item.load == 'nomore') {
+				return;
 			}
 			// 判断是否加载中
-			if(item.load=='loading'){
-				return ;
+			if (item.load == 'loading') {
+				return;
 			}
 			// 判断是否为初次加载
-			if(!item.isLoding){
+			if (!item.isLoding) {
 				item.isLoding = true;
 			}
 			// 设置开始加载
 			item.load = 'loading';
 			getProducts({
-				cid:item.id,
-				page:item.page,
-				limit:item.limit
-			}).then((e) => {
-				item.list =item.list.concat( e.data);
-				if(item.list.length==item.limit){
-					item.page++
-					item.load = 'loadmore';
-				}else{
-					item.load = 'nomore';
-				}
-				// 初始化高度
-				this.getlistHeight(item.list)
-			}).catch((e) => {
-				console.log(e);
+				cid: item.id,
+				page: item.page,
+				limit: item.limit
 			})
+				.then(e => {
+					item.list = item.list.concat(e.data);
+					if (item.list.length == item.limit) {
+						item.page++;
+						item.load = 'loadmore';
+					} else {
+						item.load = 'nomore';
+					}
+					// 初始化高度
+					this.getlistHeight(item.list);
+				})
+				.catch(e => {
+					console.log(e);
+				});
 		},
 		// 點擊搜索框
 		clickSearch() {
@@ -240,6 +275,31 @@ export default {
 			uni.navigateTo({
 				url: item.wap_url
 			});
+		},
+		//获取系统消息
+		getShowList() {
+			article({
+				page: 1,
+				limit: 3
+			},2).then( ({data}) => {
+				this.showList = data
+				this.showTitle = data.map( item => {
+					return item.title
+				})
+			})
+		},
+		//系统消息跳转详情
+		goDetails(e) {
+			console.log(e)
+			uni.navigateTo({
+				url: '/pages/user/addmenDetail?id=' + this.showList[e].id
+			});
+		},
+		nav(url) {
+			// console.log('dddddddddddddddddd')
+			uni.navigateTo({
+				url: url
+			})
 		}
 	}
 };
@@ -252,7 +312,7 @@ page {
 .m-t {
 	margin-top: 16rpx;
 }
-.list-box{
+.list-box {
 	margin-top: 30rpx;
 }
 /* 头部 轮播图 */
@@ -374,7 +434,7 @@ page {
 		font-weight: bold;
 		line-height: 1;
 		line-height: 80rpx;
-		.iconJf{
+		.iconJf {
 			width: 23rpx;
 			margin-right: 5rpx;
 		}
@@ -498,4 +558,120 @@ page {
 		color: $font-color-light;
 	}
 }
+.xtxx {
+	width: 100%;
+	height: 70rpx;
+	position: relative;
+	margin: 22rpx 0 20rpx;
+	.bg {
+		display: inline-block;
+		width: 690rpx;
+		position: absolute;
+		right: 0;
+		left: 0;
+		margin: 0 auto;
+	}
+	.ld {
+		width: 28rpx;
+		height: 34rpx;
+		position: absolute;
+		top: 18rpx;
+		left: 55rpx;
+	}
+}
+.tongz {
+	width: 690rpx;
+	height: 70rpx;
+	margin: 48rpx auto 0;
+	padding: 18rpx 30rpx 18rpx 24rpx;
+	align-items: center;
+	position: relative;
+	.tongz-bg {
+		position: absolute;
+		top: 0;
+		right: 0;
+		left: 0;
+		width: 690rpx;
+		height: 70rpx;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.tongz-left {
+		width: 640rpx;
+		.image-left {
+			width: 28rpx;
+			height: 34rpx;
+		}
+		.tongz-font {
+			margin-left: 22rpx;
+			font-size: 28rpx;
+			font-family: Source Han Sans CN;
+			font-weight: 400;
+			color: #0f253a;
+		}
+	}
+	.tongz-right {
+		position: relative;
+		z-index: 11;
+		width: 12rpx;
+		height: 26rpx;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+}
+.good-wrapper {
+	padding: 0 30rpx;
+	.good {
+		width: 681rpx;
+		height: 257rpx;
+		background: #FFFFFF;
+		box-shadow: 0px 0px 15rpx 0px rgba(10, 13, 47, 0.14);
+		border-radius: 14rpx;
+		margin: 0 auto 20rpx;
+		padding: 18rpx 19rpx 17rpx;
+		display: flex;
+		
+		.image-wrapper {
+			width: 222rpx;
+			height: 222rpx;
+			border-radius: 14rpx;
+			flex-shrink: 0;
+			// background-color: red;
+			image {
+				width: 100%;
+				height: 100%;
+				opacity: 1;
+				border-radius: 14rpx;
+			}
+		}
+		.good-info {
+			padding-left: 22rpx;
+			position: relative;
+			.info-title {
+				padding-top: 20rpx;
+				font-size: 32rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
+			}
+			.info-price {
+				font-size: 36rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #FFC000;
+				line-height: 35px;
+				position: absolute;
+				bottom: 0;
+				left: 22rpx;
+				display: flex;
+				align-items: center;
+			}
+		}
+		
+	}
+}
 </style>

pages/money/pay.vue

@@ -1,18 +1,18 @@
 <template>
 	<view class="app">
 		<view class="price-box">
-			<text>支付金额</text>
+			<text>支付积分</text>
 			<text class="price">{{ money }}</text>
 		</view>
 		<view class="pay-type-list">
-			<view class="type-item b-b" @click="changePayType(1)">
+			<!-- <view class="type-item b-b" @click="changePayType(1)">
 				<text class="icon iconfont iconweixin"></text>
 				<view class="con">
 					<text class="tit">微信支付</text>
 					<text>推荐使用微信支付</text>
 				</view>
 				<label class="radio"><radio value="" color="#5dbc7c" :checked="payType == 1"></radio></label>
-			</view>
+			</view> -->
 			<!-- #ifdef APP-PLUS -->
 			<view class="type-item b-b" @click="changePayType(2)">
 				<text class="icon iconfont iconzhifubao"></text>
@@ -23,13 +23,13 @@
 			<view class="type-item" @click="changePayType(3)">
 				<text class="icon iconfont iconyue"></text>
 				<view class="con">
-					<text class="tit">余额支付</text>
-					<text>可用余额 ¥{{ now_money }}</text>
+					<text class="tit">积分支付</text>
+					<text>可用积分 ¥{{ now_money }}</text>
 				</view>
 				<label class="radio"><radio value="" color="#5dbc7c" :checked="payType == 3"></radio></label>
 			</view>
 		</view>
-		<text class="mix-btn" :class="{ clickbg: payLoding }" @click="!payLoding ? confirm() : ''">确认支付</text>
+		<text class="mix-btn" :class="{ clickbg: payLoding }" @click="!payLoding ? confirm() : ''">确认兑换</text>
 	</view>
 </template>
 
@@ -40,12 +40,12 @@ import { mapState } from 'vuex';
 export default {
 	data() {
 		return {
-			payType: 1, //支付类型
+			payType: 3, //支付类型
 			// #ifdef H5
-			payName: 'weixin',
+			payName: 'yue',
 			// #endif
 			// #ifdef MP-WEIXIN
-			payName: 'weixin',
+			payName: 'yue',
 			// #endif
 			orderInfo: {},
 			money: 0.0, //订单金额

pages/money/wallet.vue

@@ -2,11 +2,17 @@
 	<view class="content">
 		<view class="content-money">
 			<view class="money-box">
-				<view class="text">可提现金额（元）</view>
+				<view class="text">可用积分</view>
 				<view class="money">{{ money | getMoneyStyle }}</view>
+				<view class="textt">
+					已用积分
+				</view>
+				<view class="money">
+					{{ userInfo.use_money | getMoneyStyle }}
+				</view>
 			</view>
-			<view class="moneyTx" @click="navto('/pages/money/recharge')">充值</view>
-			<view class="flex buttom-box">
+			<!-- <view class="moneyTx" @click="navto('/pages/money/recharge')">充值</view> -->
+			<!-- <view class="flex buttom-box">
 				<view class="buttom" @click="navto('/pages/money/recharge')">
 					<view class="icon"><image class="icon-img" src="/static/icon/i5.png" mode="aspectFit"></image></view>
 					<text>充值</text>
@@ -16,7 +22,7 @@
 					<view class="icon"><image class="icon-img" src="/static/icon/i1.png" mode="aspectFit"></image></view>
 					<text>提现</text>
 				</view>
-			</view>
+			</view> -->
 		</view>
 		<view class="navbar">
 			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
@@ -31,7 +37,7 @@
 					<view v-for="(item, index) in tabItem.orderList" :key="index" class="order-item flex">
 						<view class="title-box">
 							<view class="title">
-								<text>{{ item.title }}</text>
+								<text>{{ item.title }}: {{item.mark}}</text>
 							</view>
 							<view class="time">
 								<text>{{ item.add_time }}</text>
@@ -49,6 +55,7 @@
 </template>
 
 <script>
+	import { mapState, mapMutations } from 'vuex';
 import { spreadCommission, userBalance } from '@/api/wallet.js';
 import { getMoneyStyle } from '@/utils/rocessor.js';
 import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
@@ -61,6 +68,9 @@ export default {
 		empty,
 		uniLoadMore
 	},
+	computed: {
+		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin']),
+	},
 	onReady() {
 		// 初始化获取页面宽度
 		uni.createSelectorQuery()
@@ -248,6 +258,9 @@ page {
 	.money {
 		font-size: 56rpx;
 	}
+	.textt {
+		font-size: $font-sm;
+	}
 }
 
 .navbar {

pages/order/createOrder.vue

@@ -40,7 +40,7 @@
 			<view class="order-content" v-if="!shopAddress.name">
 				<view class="addAddress">
 					<text class="iconfont iconaddition"></text>
-					<text>添加收货地址</text>
+					<text>选择门店</text>
 				</view>
 			</view>
 			<image class="a-bg" :src="addressImg"></image>
@@ -132,8 +132,8 @@
 		<!-- 底部 -->
 		<view class="footer">
 			<view class="price-content">
-				<text>实付款</text>
-				<text class="price-tip">￥</text>
+				<text>实付积分</text>
+				<!-- <text class="price-tip">￥</text> -->
 				<text class="price">{{ payPrice }}</text>
 			</view>
 			<text class="submit" :class="{ submitNo: !payType }" @click="payType ? submit() : ''">提交订单</text>

pages/order/evaluate.vue

@@ -7,7 +7,7 @@
 					<view class="flex">
 						<text class="title">{{ productInfo.store_name }}</text>
 						<view class="title-right">
-							<view class="price">{{ productInfo.price }}</view>
+							<view class="price"><image class="jff" src="../../static/icon/iconU1.png" mode="widthFix"></image>{{ productInfo.price }}</view>
 							<view class="attr-box">x{{ list.cart_num }}</view>
 						</view>
 					</view>
@@ -118,19 +118,19 @@ export default {
 		//提交评论
 		submit(e) {
 			let obj = this;
-			if (obj.imgList.length < 1) {
-				uni.showToast({
-					title: '请添加图片',
-					icon: 'none'
-				});
-				return;
-			}
-			for (let i = 0; i < obj.imgList.length; i++) {
-				obj.cloudimgList.push(obj.imgList[i].url);
-			}
-			let arr = obj.cloudimgList.join(',');
+			// if (obj.imgList.length < 1) {
+			// 	uni.showToast({
+			// 		title: '请添加图片',
+			// 		icon: 'none'
+			// 	});
+			// 	return;
+			// }
+			// for (let i = 0; i < obj.imgList.length; i++) {
+			// 	obj.cloudimgList.push(obj.imgList[i].url);
+			// }
+			// let arr = obj.cloudimgList.join(',');
 			order_comment({
-				pics: arr,
+				// pics: arr,
 				comment: obj.text,
 				product_score: obj.rateValue1,
 				service_score: obj.rateValue2,
@@ -242,11 +242,11 @@ page {
 			.price {
 				font-size: $font-base + 2rpx;
 				color: $font-color-dark;
-				&:before {
-					content: '￥';
-					font-size: $font-sm;
-					margin: 0 2rpx 0 8rpx;
-				}
+				// &:before {
+				// 	content: '￥';
+				// 	font-size: $font-sm;
+				// 	margin: 0 2rpx 0 8rpx;
+				// }
 			}
 		}
 	}
@@ -402,4 +402,10 @@ page {
 	transform: scaleY(0.3);
 	background-color: rgba(0, 0, 0, 0.5);
 }
+.jff {
+	display: inline-block;
+	margin-right: 8rpx;
+	width: 20rpx;
+	height: 20rpx;
+}
 </style>

pages/order/order.vue

@@ -58,7 +58,7 @@
 							<button v-if="item._status._title == '未支付'" @click.stop="orderPay(item)" class="action-btn recom">立即支付</button>
 							<button v-if="item._status._title == '待评价'" class="action-btn">评价</button>
 							<button v-if="item._status._title == '待收货'" @click.stop="orderTake(item, index)" class="action-btn">确认收货</button>
-							<button v-if="item._status._title == '未发货'" class="action-btn" @click.stop="orderRefund(item)">申请退款</button>
+							<!-- <button v-if="item._status._title == '未发货'" class="action-btn" @click.stop="orderRefund(item)">申请退款</button> -->
 						</view>
 					</view>
 
@@ -474,11 +474,11 @@ page,
 				display: inline;
 				font-size: $font-base + 2rpx;
 				color: $font-color-dark;
-				&:before {
-					content: '￥';
-					font-size: $font-sm;
+				// &:before {
+				// 	content: '￥';
+				// 	font-size: $font-sm;
 					
-				}
+				// }
 			}
 		}
 	}
@@ -496,11 +496,11 @@ page,
 		.price {
 			font-size: $font-lg;
 			color: $font-color-dark;
-			&:before {
-				content: '￥';
-				font-size: $font-sm;
-				margin: 0 2rpx 0 8rpx;
-			}
+			// &:before {
+			// 	content: '￥';
+			// 	font-size: $font-sm;
+			// 	margin: 0 2rpx 0 8rpx;
+			// }
 		}
 	}
 	.action-box {

pages/order/orderDetail.vue

@@ -41,7 +41,7 @@
 					<view class="flex">
 						<text class="title">{{ goodsItem.productInfo.store_name }}</text>
 						<view class="title-right">
-							<view class="price">{{ goodsItem.productInfo.price }}</view>
+							<view class="price"><image class="jff" src="../../static/icon/iconU1.png" mode="widthFix"></image>{{ goodsItem.productInfo.price }}</view>
 							<view class="attr-box">
 								{{ goodsItem.attrInfo ? goodsItem.attrInfo.suk : '' }} x {{ goodsItem.cart_num + '' + (goodsItem.productInfo.unit_name || '') }}
 							</view>
@@ -56,27 +56,27 @@
 		</view>
 		<view class="row b-b flex">
 			<text class="tit">订单总价</text>
-			<view class="input">￥{{ payAllMoney }}</view>
+			<view class="input"><image class="jff" src="../../static/icon/iconU1.png" mode="widthFix"></image>{{ payAllMoney }}</view>
 		</view>
 		<view class="row b-b flex" v-if="vipMoney > 0">
 			<text class="tit">vip优惠</text>
-			<view class="input">-￥{{ vipMoney }}</view>
+			<view class="input">-<image class="jff" src="../../static/icon/iconU1.png" mode="widthFix"></image>{{ vipMoney }}</view>
 		</view>
-		<view class="row b-b flex">
+		<!-- <view class="row b-b flex">
 			<text class="tit">邮费</text>
 			<view class="input">{{ moneyNum(item.pay_postage) > 0 ? '￥' + item.pay_postage : '免邮费' }}</view>
-		</view>
+		</view> -->
 		<view class="row b-b flex" v-if="item.coupon_id > 0">
 			<text class="tit">优惠券</text>
-			<view class="input">-￥{{ moneyNum(item.coupon_price) }}</view>
+			<view class="input">-<image class="jff" src="../../static/icon/iconU1.png" mode="widthFix"></image>{{ moneyNum(item.coupon_price) }}</view>
 		</view>
 		<view class="row b-b flex" v-if="moneyNum(item.use_integral) > 0">
 			<text class="tit">积分抵扣</text>
-			<view class="input">-￥{{ moneyNum(item.use_integral) }}</view>
+			<view class="input">-<image class="jff" src="../../static/icon/iconU1.png" mode="widthFix"></image>{{ moneyNum(item.use_integral) }}</view>
 		</view>
 		<view class="row b-b flex">
 			<text class="tit ">实付</text>
-			<view class="input payColor">￥{{ item.pay_price }}</view>
+			<view class="input payColor"><image class="jff" src="../../static/icon/iconU1.png" mode="widthFix"></image>{{ item.pay_price }}</view>
 		</view>
 
 		<view class="orderDetialBox">
@@ -112,7 +112,7 @@
 			<view class="item flex">
 				<view class="title-left flex">
 					<text class="title">支付方式:</text>
-					<view class="text">{{ item._status._payType || '' }}</view>
+					<view class="text">积分支付</view>
 				</view>
 			</view>
 		</view>
@@ -433,11 +433,11 @@ page {
 			.price {
 				font-size: $font-base + 2rpx;
 				color: $font-color-dark;
-				&:before {
-					content: '￥';
-					font-size: $font-sm;
-					margin: 0 2rpx 0 8rpx;
-				}
+				// &:before {
+				// 	content: '￥';
+				// 	font-size: $font-sm;
+				// 	margin: 0 2rpx 0 8rpx;
+				// }
 			}
 			.evaluate {
 				color: #ffffff;
@@ -494,4 +494,10 @@ $btHeight: 100rpx;
 	.bottom {
 	}
 }
+.jff {
+	display: inline-block;
+	margin-right: 8rpx;
+	width: 20rpx;
+	height: 20rpx;
+}
 </style>

pages/product/common/topSwiper.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="carousel">
-		<swiper indicator-dots :circular="true" duration="400">
+		<swiper indicator-dots :circular="true" duration="400" autoplay interval="5000">
 			<swiper-item class="swiper-item" v-for="(item, index) in imgList" :key="index">
 				<view class="image-wrapper"><image :src="item" class="loaded" mode="scaleToFill"></image></view>
 			</swiper-item>

pages/user/addmen.vue

@@ -0,0 +1,106 @@
+<template>
+	<view class="container">
+		<view v-if="list.length > 0" class="list-box flex_item" v-for="(ls,index) in list" :key='index' @click="nav(index)">
+			<image :src="ls.image_input[0]"></image>
+			<view class="list-item">
+				<view class="title ellipsis">{{ls.title}}</view>
+				<!-- <view class="time">{{ls.add_time}}</view> -->
+			</view>
+		</view>
+		<view class="empty-box" v-show="list.length === 0"><empty></empty></view>
+	</view>
+</template>
+<script>
+import { article } from '@/api/index.js';
+import empty from '@/components/empty';
+export default {
+	components: {
+		empty
+	},
+	data() {
+		return {
+			list:'',
+			cid: '',
+		};
+	},
+	onLoad(option){
+		if(option.id) {
+			this.cid = option.id
+		}
+		if(option.id == '1') {
+			uni.setNavigationBarTitle({
+				title: '加盟信息列表'
+			});
+		}
+		if(option.id == '2') {
+			uni.setNavigationBarTitle({
+				title: '消息列表'
+			});
+		}
+		this.loadData();
+	},
+	onShow() {
+		
+	},
+	methods: {
+		// 请求载入数据
+		async loadData() {
+			let obj = this;
+			article({
+				page:1,
+				limit:10000
+			},obj.cid).then(({ data }) => {
+				console.log(data)
+				obj.list = data;
+			});
+		},
+		nav(index){
+			uni.navigateTo({
+				url: '/pages/user/addmenDetail?id=' + this.list[index].id
+			})
+		},
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	min-height: 100%;
+	background-color: #ffffff;
+	.container {
+		width: 100%;
+		padding: 25rpx 27rpx;
+		
+	}
+}
+.empty-box{
+	margin-top: 100rpx;
+	width: 100%;
+	height: 500rpx;
+}
+.list-box{
+	border-bottom: 1rpx solid #E3E3E3;
+	margin-bottom: 25rpx;
+	padding-bottom: 25rpx;
+	image{
+		width: 200rpx;
+		height: 160rpx;
+		border-radius: 15rpx;
+	}
+	.list-item{
+		padding-left: 16rpx;
+		width: 80%;
+		.title{
+			height: 80rpx;
+			color: #333333;
+			font-size: 30rpx;
+			font-weight: 500;
+		}
+		.time{
+			padding-top: 40rpx;
+			color: #999999;
+			font-size: 24rpx;
+		}
+	}
+}
+</style>

pages/user/addmenDetail.vue

@@ -0,0 +1,95 @@
+<template>
+	<view class="center">
+		<!-- <view class="bg"><image :src="src" mode=""></image></view> -->
+		<!-- <view class="title">{{ title }}</view> -->
+		<view v-html="synopsis" class="content">{{ synopsis }}</view>
+	</view>
+</template>
+
+<script>
+import { details } from '@/api/index.js';
+export default {
+	data() {
+		return {
+			src: '',
+			title: '',
+			synopsis: '',
+			time: ''
+		};
+	},
+	onLoad(option) {
+		this.loadData(option.id);
+	},
+	methods: {
+		async loadData(id) {
+			let obj = this;
+			details({}, id).then(e => {
+				console.log(e);
+				if (e.data.cid == '2') {
+					uni.setNavigationBarTitle({
+						title: '消息详情'
+					});
+				}
+				if (e.data.cid == '1') {
+					uni.setNavigationBarTitle({
+						title: '加盟信息详情'
+					});
+				}
+				obj.src = e.data.image_input[0];
+				obj.title = e.data.title;
+				obj.synopsis = e.data.content;
+				obj.time = e.data.add_time;
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.center {
+	height: 100%;
+}
+.bg {
+	width: 100%;
+	height: 474rpx;
+	image {
+		width: 100%;
+		height: 100%;
+	}
+}
+.title {
+	width: 90%;
+	margin: 0 auto;
+	font-size: 40rpx;
+	font-weight: 500;
+	color: #171313;
+	text-overflow: -o-ellipsis-lastline;
+	overflow: hidden;
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
+}
+.time {
+	width: 90%;
+	margin: 0 auto;
+	margin-top: 16rpx;
+	font-size: 24rpx;
+	font-weight: 500;
+	color: #656b6c;
+}
+.content {
+	width: 90%;
+	margin: 0 auto;
+	padding-top: 20rpx;
+	// margin-top: 20rpx;
+	font-size: 32rpx;
+	font-weight: 500;
+	color: #777777;
+}
+/deep/ .content {
+	img {
+		width: 100%;
+		height: 100%;
+	}
+}
+</style>

pages/user/extension.vue

@@ -11,12 +11,12 @@
 			 <view class="money-frame">
 				 <!-- <view class="money_name">我的推广</view> -->
 				 <view class="money_num">
-					{{all || '0'}}
+					{{total || '0'}}
 					<text class="money_ren">人</text>
 				</view>
 			 </view>
 			</view>
-			<view class="flex buttom-box">
+			<!-- <view class="flex buttom-box">
 				<view class="buttom" :class="{ current: tabCurrentIndex === 0 }" @click="tabClick(0)">
 					<view class="money">{{total || 0}}</view>
 					<text class="text">直接推荐</text>
@@ -26,7 +26,7 @@
 					<view class="money">{{totalLevel || 0}}</view>
 					<text class="text">间接推荐</text>
 				</view>
-			</view>
+			</view> -->
 		</view>
 		<swiper :current="tabCurrentIndex" :style="{ height: maxheight + 'px' }" class="swiper-box" duration="300" @change="changeTab">
 			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">

pages/user/user.vue

@@ -5,7 +5,7 @@
 			<view class="user-info-box ">
 				<view class="avatar"><image class="avatarImg" :src="userInfo.avatar||'../../static/error/missing-face.png'" mode="widthFix"></image></view>
 				<view class="username">
-					{{userInfo.nickname}}
+					{{userInfo.nickname}}<text v-if="userInfo.level > 0">({{userInfo.level == 1? '会员': userInfo.level == 2 ? '店长': '代理'}})</text>
 				</view>
 				<view class="userphone" v-if="userInfo.phone">
 					{{userInfo.phone|phoneXh}}
@@ -72,7 +72,8 @@
 					<uni-list-item title="我的推广" @click="navTo('/pages/user/extension')" thumb="/static/icon/v3.png"></uni-list-item>
 					<uni-list-item title="邀请海报" @click="navTo('/pages/user/shareQrCode')" thumb="/static/icon/v4.png"></uni-list-item>
 					<uni-list-item title="收货地址" @click="navTo('/pages/set/address')" thumb="/static/icon/v5.png"></uni-list-item>
-					<uni-list-item title="核销" @click="openQr" thumb="/static/icon/v7.png"></uni-list-item>
+					<!-- <uni-list-item title="加盟信息" @click="navTo('/pages/user/addmen?id=1')" thumb="/static/icon/v8.png"></uni-list-item> -->
+					<uni-list-item title="店长核销" @click="openQr" thumb="/static/icon/v7.png"></uni-list-item>
 					<uni-list-item title="设置" @click="navTo('/pages/set/set')" thumb="/static/icon/v6.png"></uni-list-item>
 				</uni-list>
 			</view>
@@ -85,6 +86,7 @@ import uniList from '@/components/uni-list/uni-list.vue';
 import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
 import { orderData, getUserInfo,orderVerific } from '@/api/user.js';
 import { saveUrl, interceptor } from '@/utils/loginUtils.js';
+import weixinObj from "@/plugin/jweixin-module/index.js";
 let startY = 0,
 	moveY = 0,
 	pageAtTop = true;
@@ -132,7 +134,11 @@ export default {
 			.exec();
 	},
 	computed: {
-		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin']),
+		// #ifdef H5
+		...mapState(['weichatObj'])
+		// #endif
+		
 	},
 	methods: {
 		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),

pages/user/withdmoenys.vue

@@ -9,10 +9,10 @@
 			</view>
 		</view>
 		<view class="row-box">
-			<view class="title">转账金额</view>
+			<view class="title">转账数量</view>
 			<view class="row">
-				<text class="tit">￥</text>
-				<input class="input" type="number" v-model="withdrawal" placeholder='转入金额' placeholder-class="placeholder" />
+				<image class="jff" src="../../static/icon/iconU1.png" mode="widthFix"></image>
+				<input class="input" type="number" v-model="withdrawal" placeholder='转入积分' placeholder-class="placeholder" />
 				<view class="buttom" @click="withdrawal = userInfo.now_money">全部转账</view>
 			</view>
 		</view>
@@ -79,22 +79,34 @@ export default {
 				pass: obj.password, //交易密码
 				merber: obj.withdrawal //金额
 			}
+			uni.showLoading({
+				title: '转账中...',
+				mask: true
+			})
 			transfer(data)
 				.then(e => {
+					uni.hideLoading()
 					// 允许按钮点击
 					obj.loding = false;
 					// 初始化提现金额
 					obj.withdrawal = ''
+					// 初始化交易密码
+					obj.password = ''
 					uni.showToast({
 						title: '提交成功',
 						duration: 2000,
 						position: 'top'
 					});
 					obj.dataUp();
+					setTimeout(() => {
+						uni.navigateBack()
+					},1500)
 				})
 				.catch(e => {
+					uni.hideLoading()
 					obj.loding = false;
 					console.log();
+					
 				});
 		}
 	}

static/css/cmy.css

@@ -549,3 +549,9 @@
 .position-relative {
 	position: relative;
 }
+.jff {
+	display: inline-block;
+	margin-right: 8rpx;
+	width: 20rpx;
+	height: 20rpx;
+}

unpackage/dist/build/h5/hybrid/html/cropper/index.html

@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<style type="text/css">
+	.input-label{
+		margin: 0 auto !important;
+		height: 250px !important;
+		width: 250px !important;
+	}
+</style>
+<html lang="zh">
+	<head>
+		<meta charset="UTF-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<meta http-equiv="X-UA-Compatible" content="ie=edge" />
+		<title>图片裁剪</title>
+		<link rel="stylesheet" href="cropper.min.css" />
+		<link rel="stylesheet" href="style.css" />
+		<script src="cropper.min.js"></script>
+		<script src="uni.webview.1.5.2.js"></script>
+	</head>
+	<body>
+		<div class="file-upload-box">
+			<input id="my-input" type="file" class="hidden-input" accept="image/png, image/jpeg, image/webp" />
+			<label for="my-input" class="input-label">+</label>
+		</div>
+
+		<div class="img-crop-area"></div>
+
+		<!-- <div class="previewAll">
+			<div class="preview"></div>
+			<div class="preview"></div>
+			<div class="preview"></div>
+			<div class="preview"></div>
+		</div> -->
+
+		<p>
+			<button class="btn disabled" id="save">确定</button>
+			<button class="btn disabled" id="spin" onclick='spin()'>旋转</button>
+		</p>
+		<script src="index.js"></script>
+	</body>
+</html>

unpackage/dist/build/h5/hybrid/html/cropper/index.js

@@ -0,0 +1,270 @@
+// 宽高比
+const aspectRatio = 3 / 4;
+// 自动裁剪区域, 默认为 50%
+const autoCropAre = 0.5;
+// 裁剪宽度
+const croppedWidth = 200;
+// 裁剪高度
+const croppedHeight = croppedWidth * aspectRatio;
+// 是否裁剪为圆形
+const roundedCrop = false;
+// 导出图片格式
+const imgType ='image/jpeg';
+let cropper = ''; //保存cropee对象
+
+// 旋转
+function spin(e) {
+	cropper.rotate(90)
+}
+
+const fileUploadBox = document.querySelector(".file-upload-box");
+const spinBtn = document.querySelector("#spin"); //获取旋转按钮对象
+const saveBtn = document.querySelector("#save");
+const previews = document.querySelectorAll(".preview");
+let previewReady = false;
+let croppable = false;
+
+document.addEventListener("UniAppJSBridgeReady", Init);
+
+// 初始化
+async function Init(params) {
+	console.log(`uniAppSDK loaded`);
+
+	const env = await getEnv();
+	console.log("当前环境：" + JSON.stringify(env));
+
+	const imgDataUrl = await selectFile(env);
+
+	// hidden input box
+	fileUploadBox.style.display = "none";
+
+	// create image
+	const image = new Image();
+	image.src = imgDataUrl;
+	image.crossorigin = true;
+	document.querySelector(".img-crop-area").appendChild(image);
+
+	image.onload = function() {
+		const options = {
+			aspectRatio: aspectRatio,
+			autoCropAre: autoCropAre,
+			viewMode: 1,
+			ready: function() {
+				let clone = this.cloneNode();
+
+				clone.className = "";
+				clone.style.cssText =
+					"display: block;" +
+					"width: 100%;" +
+					"min-width: 0;" +
+					"min-height: 0;" +
+					"max-width: none;" +
+					"max-height: none;";
+
+				each(previews, function(elem) {
+					elem.appendChild(clone.cloneNode());
+				});
+
+				croppable = true;
+				previewReady = true;
+				saveBtn.classList.remove("disabled");
+				spinBtn.classList.remove("disabled");
+				if (roundedCrop) {
+					const elements = document.querySelectorAll(
+						".cropper-view-box, .cropper-face"
+					);
+					for (let item of elements) {
+						item.style.borderRadius = "50%";
+					}
+				}
+			},
+			crop: function(event) {
+				if (!previewReady) {
+					return;
+				}
+
+				let data = event.detail;
+				let cropper = this.cropper;
+				let imageData = cropper.getImageData();
+				let previewAspectRatio = data.width / data.height;
+
+				each(previews, function(elem) {
+					let previewImage = elem.getElementsByTagName("img").item(0);
+
+					let previewWidth = elem.offsetWidth;
+					let previewHeight = previewWidth / previewAspectRatio;
+					let imageScaledRatio = data.width / previewWidth;
+
+					if (roundedCrop) {
+						elem.style.borderRadius = "50%";
+					}
+
+					elem.style.height = previewHeight + "px";
+					previewImage.style.width =
+						imageData.naturalWidth / imageScaledRatio + "px";
+					previewImage.style.height =
+						imageData.naturalHeight / imageScaledRatio + "px";
+					previewImage.style.marginLeft = -data.x / imageScaledRatio + "px";
+					previewImage.style.marginTop = -data.y / imageScaledRatio + "px";
+				});
+			},
+		};
+		// 保存cropper对象
+		cropper = new Cropper(image, options);
+
+		save.addEventListener("click", () => {
+			if (!croppable) {
+				return;
+			}
+
+			let croppedCanvas = cropper.getCroppedCanvas({
+				width: croppedWidth,
+				height: croppedHeight,
+			});
+
+			if (roundedCrop) {
+				croppedCanvas = getRoundedCanvas(croppedCanvas);
+			}
+
+			const postData = {
+				data: {
+					type: "croppedData",
+					dataUrl: croppedCanvas.toDataURL(imgType),
+				},
+			};
+
+
+			if (env.plus) {
+				uni.postMessage(postData);
+			} else if (env.h5) {
+				top.postMessage(postData);
+			} else if (env.miniprogram) {
+				// 小程序
+				top.postMessage(postData);
+			}
+			// // 	// back to previous page
+			uni.navigateBack({
+				delta: 1,
+			});
+		});
+	};
+}
+
+function getRoundedCanvas(sourceCanvas) {
+	let canvas = document.createElement("canvas");
+	let context = canvas.getContext("2d");
+	let width = sourceCanvas.width;
+	let height = sourceCanvas.height;
+
+	canvas.width = width;
+	canvas.height = height;
+	context.imageSmoothingEnabled = true;
+	context.drawImage(sourceCanvas, 0, 0, width, height);
+	context.globalCompositeOperation = "destination-in";
+	context.beginPath();
+	context.arc(
+		width / 2,
+		height / 2,
+		Math.min(width, height) / 2,
+		0,
+		2 * Math.PI,
+		true
+	);
+	context.fill();
+	return canvas;
+}
+
+function each(arr, callback) {
+	let length = arr.length;
+	let i;
+
+	for (i = 0; i < length; i++) {
+		callback.call(arr, arr[i], i, arr);
+	}
+
+	return arr;
+}
+
+async function selectFile(env) {
+	const fileInput = document.querySelector("#my-input");
+	return new Promise((resolve, reject) => {
+		fileInput.addEventListener("change", async (event) => {
+			let result;
+			result = await getDataUrlFromReader(event);
+			resolve(result);
+		});
+	});
+}
+
+async function getDataUrlFromReader(event) {
+	const files = event.target.files;
+	return new Promise((resolve, reject) => {
+		const reader = new FileReader();
+		reader.addEventListener("loadend", () => {
+			resolve(reader.result);
+		});
+		reader.readAsDataURL(files[0]);
+	});
+}
+
+async function getEnv() {
+	return new Promise((resolve, reject) => {
+		uni.getEnv((res) => {
+			resolve(res);
+		});
+	});
+}
+
+// TODO:
+async function chooseWithPlusApi() {
+	const btnArray = [{
+			title: "拍照",
+		},
+		{
+			title: "从手机相册选择",
+		},
+	];
+
+	return new Promise((resolve, reject) => {
+		plus.nativeUI.actionSheet({
+				cancel: "取消",
+				buttons: btnArray,
+			},
+			function(e) {
+				let index = e.index;
+				switch (index) {
+					case 0:
+						break;
+					case 1:
+						let camera = plus.camera.getCamera();
+						camera.captureImage(
+							function(file) {
+								resolve(file);
+							},
+							function() {
+								console.log("从相机获取照片失败");
+								reject("从相机获取照片失败");
+							}, {
+								filename: "_doc/photo/",
+								index: 1,
+							}
+						);
+						break;
+					case 2:
+						plus.gallery.pick(
+							function(file) {
+								resolve(file);
+							},
+							function() {
+								console.log("取消图片选择");
+								reject("取消图片选择");
+							}, {
+								multiple: false,
+							}
+						);
+						break;
+				}
+			}
+		);
+	});
+}

unpackage/dist/build/h5/hybrid/html/cropper/style.css

@@ -0,0 +1,149 @@
+/* button styles */
+.btn {
+  box-sizing: border-box;
+  position: relative;
+  display: inline-block;
+  font-weight: 400;
+  line-height: 1.5;
+  color: #000;
+  text-align: center;
+  text-decoration: none;
+  vertical-align: middle;
+  cursor: pointer;
+  user-select: none;
+  background-color: #e9ecef;
+  border: 1px solid #e9ecef;
+  padding: 0.375rem 0.75rem;
+  font-size: 1rem;
+  border-radius: 4px;
+  transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out,
+    border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
+}
+.btn *,
+.btn *::before,
+.btn *::after {
+  box-sizing: inherit;
+}
+.btn img,
+.btn svg {
+  display: inline-flex;
+  vertical-align: -0.125em;
+  width: 1em;
+  height: 1em;
+}
+.btn:hover {
+  text-decoration: none;
+  background-color: #cbd3da;
+}
+.btn:focus {
+  outline: none;
+}
+.btn.disabled,
+.btn:disabled {
+  opacity: 0.65;
+  pointer-events: none;
+}
+
+.btn.primary {
+  background-color: #007bff;
+  border-color: #007bff;
+  color: #fff;
+}
+.btn.primary:hover {
+  text-decoration: none;
+  background-color: #0062cc;
+}
+
+.btn.outline {
+  background-color: transparent;
+  border-color: #e9ecef;
+}
+.btn.outline:hover {
+  text-decoration: none;
+  background-color: #e9ecef;
+}
+
+.btn.link {
+  background-color: transparent;
+  color: #007bff;
+  border-color: transparent;
+}
+.btn.link:hover {
+  background-color: #e9ecef;
+}
+
+.btn.block {
+  width: 100%;
+  display: block;
+}
+
+.btn.small {
+  padding: 0.1rem 0.4rem;
+}
+
+/* index.html */
+
+*,
+*::before,
+*::after {
+  box-sizing: border-box;
+}
+
+body,
+html {
+  padding: 0;
+  margin: 0;
+}
+
+body {
+  padding: 0.5rem;
+}
+
+img {
+  display: block;
+  /* This rule is very important, please don't ignore this */
+  max-width: 100%;
+  max-height: 400px;
+  width: 100%;
+}
+
+.previewAll {
+  display: grid;
+  grid-template-columns: 4fr 3fr 2fr 1fr;
+  gap: 0.5rem;
+  margin-top: 0.5rem;
+}
+
+.previewAll .preview {
+  overflow: hidden;
+}
+
+/* file input */
+
+.file-upload-box {
+  position: relative;
+}
+.file-upload-box .hidden-input {
+  position: absolute !important;
+  width: 1px;
+  height: 1px;
+  overflow: hidden;
+  clip: rect(1px 1px 1px 1px);
+}
+.file-upload-box input.hidden-input:focus + label {
+  outline: thin dotted;
+}
+.file-upload-box input.hidden-input:focus-within + label {
+  outline: thin dotted;
+}
+.file-upload-box .input-label {
+  border: 1px solid #eee;
+  width: 80px;
+  height: 80px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 2rem;
+  font-weight: lighter;
+  color: #555;
+}

unpackage/dist/build/h5/index.html

@@ -0,0 +1,2 @@
+<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>商城</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.d0f128df.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.2884e2f5.js></script><script src=/index/static/js/index.9cc4f5c2.js></script></body></html>

unpackage/dist/build/h5/static/css/cmy.css

@@ -0,0 +1,557 @@
+/*初始化类*/
+@font-face {
+	font-family: 'iconfont';
+	/* project id 1482221 */
+	src: url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.eot');
+	src: url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.eot?#iefix') format('embedded-opentype'),
+		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.woff2') format('woff2'),
+		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.woff') format('woff'),
+		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.ttf') format('truetype'),
+		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.svg#iconfont') format('svg');
+}
+
+.acea-row {
+	display: -webkit-box;
+	display: -moz-box;
+	display: -webkit-flex;
+	display: -ms-flexbox;
+	display: flex;
+	-webkit-box-lines: multiple;
+	-moz-box-lines: multiple;
+	-o-box-lines: multiple;
+	-webkit-flex-wrap: wrap;
+	-ms-flex-wrap: wrap;
+	flex-wrap: wrap
+}
+
+.acea-row.row-middle {
+	-webkit-box-align: center;
+	-moz-box-align: center;
+	-o-box-align: center;
+	-ms-flex-align: center;
+	-webkit-align-items: center;
+	align-items: center
+}
+
+.bg-color-red {
+	background-color: #e93323 !important;
+}
+
+.acea-row.row-right {
+	-webkit-box-pack: end;
+	-moz-box-pack: end;
+	-o-box-pack: end;
+	-ms-flex-pack: end;
+	-webkit-justify-content: flex-end;
+	justify-content: flex-end
+}
+
+.acea-row.row-between-wrapper {
+	-webkit-box-align: center;
+	-moz-box-align: center;
+	-o-box-align: center;
+	-ms-flex-align: center;
+	-webkit-align-items: center;
+	align-items: center;
+	-webkit-box-pack: justify;
+	-moz-box-pack: justify;
+	-o-box-pack: justify;
+	-ms-flex-pack: justify;
+	-webkit-justify-content: space-between;
+	justify-content: space-between
+}
+
+.acea-row.row-column-around {
+	-webkit-flex-direction: column;
+	-ms-flex-direction: column;
+	flex-direction: column;
+	justify-content: space-around;
+	-webkit-justify-content: space-around
+}
+
+.acea-row.row-center-wrapper {
+	-webkit-box-align: center;
+	-moz-box-align: center;
+	-o-box-align: center;
+	-ms-flex-align: center;
+	-webkit-align-items: center;
+	align-items: center;
+	-webkit-box-pack: center;
+	-moz-box-pack: center;
+	-o-box-pack: center;
+	-ms-flex-pack: center;
+	-webkit-justify-content: center;
+	justify-content: center
+}
+
+.iconfont {
+	font-family: "iconfont" !important;
+	font-size: 34rpx;
+	font-style: normal;
+	-webkit-font-smoothing: antialiased;
+	-webkit-text-stroke-width: 0rpx;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+.iconedit:before {
+	content: "\e649";
+}
+
+.iconfavorfill:before {
+	content: "\e64b";
+}
+
+.iconfavor:before {
+	content: "\e64c";
+}
+
+.iconlocation:before {
+	content: "\e651";
+}
+
+.iconroundcheckfill:before {
+	content: "\e656";
+}
+
+.iconroundcheck:before {
+	content: "\e657";
+}
+
+.iconunfold:before {
+	content: "\e661";
+}
+
+.iconlikefill:before {
+	content: "\e668";
+}
+
+.iconlike:before {
+	content: "\e669";
+}
+
+.iconshop:before {
+	content: "\e676";
+}
+
+.iconcart:before {
+	content: "\e6af";
+}
+
+.icondelete:before {
+	content: "\e6b4";
+}
+
+.iconhome:before {
+	content: "\e6b8";
+}
+
+.iconcartfill:before {
+	content: "\e6b9";
+}
+
+.iconhomefill:before {
+	content: "\e6bb";
+}
+
+.iconlock:before {
+	content: "\e6c0";
+}
+
+.iconfriendadd:before {
+	content: "\e6ca";
+}
+
+.iconfold:before {
+	content: "\e6de";
+}
+
+.iconapps:before {
+	content: "\e729";
+}
+
+.iconadd:before {
+	content: "\e767";
+}
+
+.iconmove:before {
+	content: "\e768";
+}
+
+.icontriangledownfill:before {
+	content: "\e79b";
+}
+
+.icontriangleupfill:before {
+	content: "\e79c";
+}
+
+.iconshaixuan:before {
+	content: "\e74a";
+}
+
+.iconyanzhengma:before {
+	content: "\e684";
+}
+
+.iconjifen:before {
+	content: "\e60f";
+}
+
+.iconwuliuxinxi:before {
+	content: "\e62b";
+}
+
+.iconmessage:before {
+	content: "\e78a";
+}
+
+.iconsetting:before {
+	content: "\e78e";
+}
+
+.iconaddition:before {
+	content: "\e6e0";
+}
+
+.iconclose:before {
+	content: "\e6e9";
+}
+
+.iconenter:after {
+	content: "\e6f8";
+}
+
+.iconprompt:before {
+	content: "\e71b";
+}
+
+.iconreturn:before {
+	content: "\e720";
+}
+
+.iconsearch:before {
+	content: "\e741";
+}
+
+.iconpengyouquan:before {
+	content: "\e62c";
+}
+
+.iconweixin:before {
+	content: "\e60e";
+}
+
+.iconzhifubao:before {
+	content: "\e673";
+}
+
+.iconyue:before {
+	content: "\e618";
+}
+
+.iconweixin1:before {
+	content: "\e622";
+}
+
+.iconlock1:before {
+	content: "\e64d";
+}
+
+.iconuser:before {
+	content: "\e64e";
+}
+
+.iconchenggongtixianshouyi:before {
+	content: "\e64f";
+}
+
+.iconviptuiguangdingdan:before {
+	content: "\e650";
+}
+
+.icondaifukuan:before {
+	content: "\e652";
+}
+
+.icondaijiesuanshouyi:before {
+	content: "\e653";
+}
+
+.icondaidakuanshouyi:before {
+	content: "\e654";
+}
+
+.icondaifahuo:before {
+	content: "\e655";
+}
+
+.icondaishouhuoshouyi:before {
+	content: "\e658";
+}
+
+.icondaishouhuo:before {
+	content: "\e659";
+}
+
+.iconwuxiaoshouyi:before {
+	content: "\e65a";
+}
+
+.icontixianmingxi:before {
+	content: "\e65b";
+}
+
+.iconshouyi:before {
+	content: "\e65c";
+}
+
+.iconkouchutixianshouxufei:before {
+	content: "\e65d";
+}
+
+.iconyishenqingshouyi:before {
+	content: "\e65e";
+}
+
+.icontuihuanhuo:before {
+	content: "\e65f";
+}
+
+
+/*水平线*/
+.hr {
+	width: 100%;
+	position: relative;
+	border-bottom: 1px solid #dddddd;
+	/* height: 0.5rpx; */
+}
+
+/* 一行显示 */
+.clamp {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	display: block;
+}
+
+/* 二行显示 */
+.clamp2 {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
+}
+
+/* 二行显示 */
+.ellipsis {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 2;
+}
+
+.common-hover {
+	background: #f5f5f5;
+}
+
+/* 角标 */
+.corner {
+	background-color: #e51c23;
+	position: absolute;
+	right: -18rpx;
+	top: -18rpx;
+	color: #FFFFFF;
+	text-align: center;
+	border-radius: 999px;
+	font-size: 24rpx !important;
+	min-width: 35rpx;
+	min-height: 35rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	line-height: 1;
+}
+
+.flex_item {
+	display: flex;
+	align-items: center;
+	/* justify-content: space-between; */
+}
+
+/* 左右顶格加上下居中 */
+.flex-between-center {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+
+/* flex布局-整体居中 */
+.flex-center {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.flex-start {
+	display: flex;
+	align-items: center;
+	justify-content: flex-start;
+}
+
+/*文字对齐*/
+.text-left {
+	text-align: left !important;
+}
+
+.text-center {
+	text-align: center !important;
+}
+
+.text-justify {
+	text-align: justify !important;
+}
+
+.text-right {
+	text-align: right !important;
+}
+
+.text-default {
+	color: #212121 !important;
+}
+
+.text-white {
+	color: #ffffff !important;
+}
+
+.text-primary {
+	color: #00bcd4 !important;
+}
+
+.text-success {
+	color: #009688 !important;
+}
+
+.text-info {
+	color: #03a9f4 !important;
+}
+
+.text-warning {
+	color: #ffc107 !important;
+}
+
+.text-danger {
+	color: #e51c23 !important;
+}
+
+.text-pink {
+	color: #e91e63 !important;
+}
+
+.text-purple {
+	color: #673ab7 !important;
+}
+
+.text-indigo {
+	color: #3f51b5 !important;
+}
+
+.text-gray {
+	color: #999999 !important;
+}
+
+.bg-default {
+	background-color: #f5f5f5 !important;
+}
+
+.bg-primary {
+	background-color: #00bcd4 !important;
+}
+
+.bg-success {
+	background-color: #009688 !important;
+}
+
+.bg-info {
+	background-color: #03a9f4 !important;
+}
+
+.bg-warning {
+	background-color: #FFB238 !important;
+}
+
+.bg-danger {
+	background-color: #DC4D46 !important;
+}
+
+.bg-pink {
+	background-color: #e91e63 !important;
+}
+
+.bg-purple {
+	background-color: #673ab7 !important;
+}
+
+.bg-indigo {
+	background-color: #3f51b5 !important;
+}
+
+.bg-white {
+	background-color: white !important;
+}
+
+.bg-gray {
+	background-color: #e3e3e3 !important;
+}
+
+/* 边框 */
+.border-radius-15 {
+	border-radius: 15rpx;
+}
+
+.border-radius-10 {
+	border-radius: 10rpx;
+}
+
+.border-radius-all {
+	border-radius: 1000rpx;
+}
+
+/* 底部边线 */
+.borde-b {
+	border-bottom: 1px solid #dddddd;
+}
+
+/* 弹性盒子 */
+.flex {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+
+.items-left {
+	justify-content: flex-start;
+}
+
+.items-right {
+	justify-content: flex-end;
+}
+
+.flex-shrink-false {
+	flex-shrink: 0;
+}
+
+.flex-grow-true {
+	flex-grow: 1;
+}
+
+.position-relative {
+	position: relative;
+}
+.jff {
+	display: inline-block;
+	margin-right: 8rpx;
+	width: 20rpx;
+	height: 20rpx;
+}

unpackage/dist/build/h5/static/js/pages-set-cropper.2e5c6e45.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-set-cropper"],{"0448":function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var a={name:"buuug7-img-cropper",data:function(){return{webviewStyles:{},platform:"",webviewSrc:"/hybrid/html/cropper/index.html"}},mounted:function(){var e=uni.getSystemInfoSync(),t=e.platform;this.platform=t,console.log(t,"获取系统对象"),"windows"!==t&&"mac"!==t||this.handleH5Message(),window.addEventListener("message",this.handleMessage,!1)},methods:{handleMessage:function(e){console.log("消息传输",e);var t=this.platform;if(e.data.data.type){var n=e.data.data;if("android"===t||"ios"===t){var a=this.getOpenerEventChannel();a.emit("imgCropped",{data:n.dataUrl})}}},handleH5Message:function(e){var t=this;console.log("H5Message"),window.addEventListener("message",(function(e){var n=e.data.data;if(n&&"croppedData"===n.type){var a=t.getOpenerEventChannel();a.emit("imgCropped",{data:n.dataUrl})}}))}}};t.default=a},2288:function(e,t,n){"use strict";n.r(t);var a=n("b246"),r=n("65c4");for(var i in r)"default"!==i&&function(e){n.d(t,e,(function(){return r[e]}))}(i);var s,o=n("f0c5"),d=Object(o["a"])(r["default"],a["b"],a["c"],!1,null,"56a23d59",null,!1,a["a"],s);t["default"]=d.exports},"65c4":function(e,t,n){"use strict";n.r(t);var a=n("0448"),r=n.n(a);for(var i in a)"default"!==i&&function(e){n.d(t,e,(function(){return a[e]}))}(i);t["default"]=r.a},b246:function(e,t,n){"use strict";var a;n.d(t,"b",(function(){return r})),n.d(t,"c",(function(){return i})),n.d(t,"a",(function(){return a}));var r=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("v-uni-view",{staticClass:"container"},[n("v-uni-web-view",{attrs:{"webview-styles":e.webviewStyles,src:e.webviewSrc},on:{message:function(t){arguments[0]=t=e.$handleEvent(t),e.handleMessage.apply(void 0,arguments)}}})],1)},i=[]}}]);