1-22

.hbuilderx/launch.json

@@ -2,6 +2,10 @@
   // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
     "version": "0.0",
     "configurations": [{
+     	"app-plus" : 
+     	{
+     		"launchtype" : "remote"
+     	},
      	"default" : 
      	{
      		"launchtype" : "remote"

api/index.js

@@ -33,4 +33,3 @@ export function loadIndexs(data) {
 		data
 	});
 }
-

api/wallet.js

@@ -56,6 +56,24 @@ export function rechargeRoutine(data) {
 }
 // #endif
 
+// #ifdef APP-PLUS
+// App微信充值
+export function rechargeApp(data) {
+	return request({
+		url: '/api/recharge/app',
+		method: 'post',
+		data
+	});
+}
+// App支付宝充值
+export function rechargeAli(data) {
+	return request({
+		url: '/api/recharge/ali',
+		method: 'post',
+		data
+	});
+}
+// #endif
 
 // 账户余额
 export function balance(data) {

manifest.json

@@ -14,25 +14,26 @@
             "autoclose" : true,
             "delay" : 0
         },
-        "modules" : {},
+        "modules" : {
+            "Payment" : {}
+        },
         /* 模块配置 */
         "distribute" : {
             /* 应用发布信息 */
             "android" : {
                 /* android打包配置 */
                 "permissions" : [
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
-                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>"
+                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>"
                 ],
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
             },
@@ -48,6 +49,56 @@
                         "appsecret" : "",
                         "UniversalLinks" : ""
                     }
+                },
+                "geolocation" : {},
+                "payment" : {
+                    "alipay" : {
+                        "__platform__" : [ "ios", "android" ]
+                    }
+                },
+                "push" : {},
+                "share" : {},
+                "speech" : {},
+                "ad" : {}
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
+            },
+            "splashscreen" : {
+                "androidStyle" : "default",
+                "android" : {
+                    "hdpi" : "unpackage/启动图/482.9.png",
+                    "xhdpi" : "unpackage/启动图/722.9.png",
+                    "xxhdpi" : "unpackage/启动图/1084.9.png"
                 }
             }
         }
@@ -75,6 +126,7 @@
             "proxy" : {
                 "/api" : {
                     "target" : "http://hhsc.liuniu946.com/api",
+                    // "target" : "http://jfsc.frp.liuniu946.com/api",
                     // "changeOrigin": true,
                     "pathRewrite" : {
                         "/api" : "" // rewrite path

pages.json

@@ -196,7 +196,7 @@
 		{
 			"path": "pages/contract/agreement",
 			"style": {
-				"navigationBarTitleText": "用户协议"
+				"navigationBarTitleText": "会员协议"
 			}
 		},
 		{
@@ -360,7 +360,7 @@
 		{
 			"path": "pages/money/integral",
 			"style": {
-				"navigationBarTitleText": "我的商城积分",
+				"navigationBarTitleText": "我的消费补贴券",
 				"app-plus": {
 					"titleNView": false
 				}
@@ -369,7 +369,7 @@
 		{
 			"path": "pages/money/xfIntegral",
 			"style": {
-				"navigationBarTitleText": "我的消费积分",
+				"navigationBarTitleText": "我的消费补贴券",
 				"app-plus": {
 					"titleNView": false
 				}

pages/cart/cart.vue

@@ -31,7 +31,7 @@
 						<view class="item-right">
 							<text class="clamp title">{{ item.productInfo.store_name }}</text>
 							<text class="attr">{{ item.attr_val }}</text>
-							<text class="price" v-if="item.integral != 0">¥{{ item.productInfo.price }} + {{ item.integral}}积分</text>
+							<text class="price" v-if="item.integral != 0">¥{{ item.productInfo.price }} + {{ item.integral}}消费补贴券</text>
 							<text class="price" v-else>¥{{ item.productInfo.price }}</text>
 							<uni-number-box
 								class="step"
@@ -55,7 +55,7 @@
 					<view class="clear-btn" @click="allChecked ? clearCart() : ''" :class="{ show: allChecked }"><text>清空</text></view>
 				</view>
 				<view class="total-box">
-					<text class="price" v-if="integral >0">¥{{ total }}+ {{ integral }}积分</text>
+					<text class="price" v-if="integral >0">¥{{ total }}+ {{ integral }}消费补贴券</text>
 					<text class="price" v-else>¥{{ total }}</text>
 					<!-- <text class="coupon">
 						已优惠
@@ -318,6 +318,7 @@ export default {
 		padding-left: 30rpx;
 		.title,
 		.price {
+			width: 100%;
 			font-size: $font-base + 2rpx;
 			color: $font-color-dark;
 			height: 40rpx;
@@ -334,7 +335,7 @@ export default {
 			line-height: 50rpx;
 		}
 		.step {
-			margin-top: 20rpx;
+			margin-top: 50rpx;
 		}
 	}
 	.del-btn {
@@ -363,6 +364,7 @@ export default {
 	border-radius: 16rpx;
 	.checkbox {
 		height: 52rpx;
+		width: 140rpx;
 		position: relative;
 		.icon-checked-box {
 			border-radius: 50rpx;
@@ -384,7 +386,7 @@ export default {
 		left: 26rpx;
 		top: 0;
 		z-index: 4;
-		width: 0;
+		width: 82rpx;
 		height: 52rpx;
 		line-height: 52rpx;
 		padding-left: 38rpx;
@@ -403,8 +405,8 @@ export default {
 		flex: 1;
 		display: flex;
 		flex-direction: column;
-		text-align: right;
-		padding-right: 30rpx;
+		text-align: center;
+		padding-right: 10rpx;
 		.price {
 			font-size: $font-lg;
 			color: $font-color-dark;

pages/contract/privacy.vue

@@ -13,7 +13,7 @@
 		</view>
 		<view class="title">1.您提供的信息：</view>
 		<view class="content">(1)您在注册账户或使用我们的服务时,向我们提供的相关个人信息,例如电话号码、电子邮件或银行卡号等;</view>
-		<view class="title">(2)您通过我们的服务向其他方提供的共享信息,以及您使用我们的服务时所储存的信息。</view>
+		<view class="content">(2)您通过我们的服务向其他方提供的共享信息,以及您使用我们的服务时所储存的信息。</view>
 		<view class="content">2.其他方分享的您的信息</view>
 		<view class="content">(1)其他方使用我们的服务时所提供有关您的共享信息。</view>
 		<view class="content">1.日志信息,指您使用我们的服务时,系统可能通过 cookies 、 web beacon 或其他方式自动采集的技术信息,包括: :</view>

pages/index/index.vue

@@ -50,7 +50,7 @@
 			<view class="box">
 				<view class="header">
 					<view class="left">
-						<view class="title">购买商品赠送消费积分</view>
+						<view class="title">购买商品赠送消费补贴券</view>
 						<view class="about">买到就是赚到</view>
 					</view>
 					<view class="right"><image src="@/static/img/right.png" @click="navto('/pages/index/vip')"></image></view>
@@ -110,7 +110,7 @@
 							<image src="../../static/img/jiantou.png" mode=""></image>
 							<view class="jiang">直降{{ (item.ot_price - item.price).toFixed(2) }}元</view>
 						</view>
-						<view class="price" v-if="item.integral != 0">￥{{ item.price }} + {{ item.integral }}积分</view>
+						<view class="price" v-if="item.integral != 0">￥{{ item.price }} + {{ item.integral }}消费补贴券</view>
 						<view class="price" v-else>￥{{ item.price }}</view>
 						<view class="btn">立即购买</view>
 					</view>
@@ -137,7 +137,7 @@
 </template>
 
 <script>
-import { loadIndexs } from '@/api/index.js';
+import { loadIndexs,version } from '@/api/index.js';
 import { dhList } from '@/api/product.js';
 import { mapState } from 'vuex';
 import { saveUrl, interceptor } from '@/utils/loginUtils.js';
@@ -207,6 +207,9 @@ export default {
 			});
 		}
 		this.loadData();
+		version().then(e =>{
+			console.log(e,'banbenghao')
+		})
 	},
 	//下拉刷新
 	onPullDownRefresh() {
@@ -557,7 +560,7 @@ page,
 .guess-item {
 	display: flex;
 	width: 710rpx;
-	height: 290rpx;
+	height: 300rpx;
 	background: #ffffff;
 	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
 	border-radius: 10rpx;
@@ -626,7 +629,7 @@ page,
 			}
 		}
 		.price-box {
-			margin-top: 60rpx;
+			margin-top: 50rpx;
 			justify-content: flex-start;
 			.yuanprice {
 				font-size: 26rpx;
@@ -666,7 +669,7 @@ page,
 			line-height: 56rpx;
 			text-align: center;
 			position: absolute;
-			bottom: 25rpx;
+			bottom: 10rpx;
 			right: 25rpx;
 		}
 	}

pages/money/integral.vue

@@ -3,7 +3,7 @@
 		<view class="content-money">
 			<view class="money-box">
 				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/img/fanhui.png" mode=""></image></view>
-				<view class="header">我的商城积分</view>
+				<view class="header">我的消费补贴券</view>
 				<image class="money_bg" src="../../static/img/anchor12.png"></image>
 				<view class="money">{{ userInfo.integral | getMoneyStyle }}</view>
 			</view>

pages/money/pay.vue

@@ -5,14 +5,16 @@
 			<text class="price">{{ money }}</text>
 		</view>
 		<view class="pay-type-list">
-			<view class="type-item b-b" @click="changePayType(1)">
-				<text class="icon iconfont iconweixin"></text>
-				<view class="con">
-					<text class="tit">微信支付</text>
-					<text>推荐使用微信支付</text>
+			<!-- #ifdef H5 -->
+				<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>
-				<label class="radio"><radio value="" color="#5dbc7c" :checked="payType == 1"></radio></label>
-			</view>
+			<!-- #endif -->
 			<!-- #ifdef APP-PLUS -->
 			<view class="type-item b-b" @click="changePayType(2)">
 				<text class="icon iconfont iconzhifubao"></text>
@@ -35,15 +37,19 @@
 
 <script>
 import { balance } from '@/api/wallet.js';
-import { createOrderkey,computedOrderkey,orderPay } from '@/api/order.js';
+import { createOrderkey, computedOrderkey, orderPay } from '@/api/order.js';
 import { mapState } from 'vuex';
 export default {
 	data() {
 		return {
-			payType: 1, //支付类型
 			// #ifdef H5
+			payType: 1, //支付类型
 			payName: 'weixin',
 			// #endif
+			// #ifdef APP-PLUS
+			payType: 2, //支付类型
+			payName: 'ali',
+			// #endif
 			// #ifdef MP-WEIXIN
 			payName: 'weixin',
 			// #endif
@@ -110,6 +116,7 @@ export default {
 		// 支付金额
 		orderMoneyPay() {
 			let obj = this;
+			console.log(obj.payName,'123456')
 			orderPay({
 				uni: obj.orderId,
 				// #ifdef H5
@@ -132,10 +139,10 @@ export default {
 							obj.$api.msg(msg);
 						}
 					}
+					//#ifndef APP-PLUS
 					if (obj.payName == 'weixin' || obj.payName == 'routine') {
-						
 						let da = e.data.result.jsConfig;
-						console.log(da,'数据')
+						console.log(da, '数据');
 						let data = {
 							// #ifdef H5
 							timestamp: da.timestamp,
@@ -150,24 +157,77 @@ export default {
 							success: function(res) {
 								obj.paySuccessTo();
 							},
-							fail: (e) => {
-								console.log(e,'失败')
+							fail: e => {
+								console.log(e, '失败');
 								uni.navigateTo({
 									url: '/pages/order/order?state=0'
 								});
 							}
 						};
 						// #ifdef H5
-						if(obj.payName == 'weixin'){
-						obj.weichatObj.chooseWXPay(data);
+						if (obj.payName == 'weixin') {
+							obj.weichatObj.chooseWXPay(data);
 						}
 						// #endif
 						// #ifdef MP-WEIXIN
-						if(obj.payName == 'weixin'){
+						if (obj.payName == 'weixin') {
 							wx.requestPayment(data);
 						}
 						// #endif
 					}
+					//#endif
+					//#ifdef APP-PLUS
+					if (obj.payName == 'weixin' || obj.payName == 'routine') {
+						let da = e.data.result.jsConfig;
+						console.log('--da--', da);
+						let data = {
+							appid: da.appid,
+							noncestr: da.noncestr,
+							package: da.package,
+							partnerid: da.partnerid,
+							prepayid: da.prepayid,
+							timestamp: da.timestamp,
+							sign: da.sign
+						};
+						console.log('--data--', data);
+						uni.requestPayment({
+							provider: 'wxpay',
+							orderInfo: data,
+							success(res) {
+								console.log(res);
+								uni.showToast({
+									title: '支付成功',
+									duration: 2000
+								});
+								obj.paySuccessTo();
+							},
+							fail(res) {
+								console.log(res, '失败');
+							}
+						});
+					}
+					if (obj.payName == 'ali') {
+						const url = e.data.result.jsConfig;
+						console.log(url, 'url');
+						uni.requestPayment({
+							provider: 'alipay',
+							orderInfo: url,
+							success: res => {
+								console.log(res);
+								uni.showToast({
+									title: '支付成功',
+									duration: 2000
+								});
+								obj.paySuccessTo();
+							},
+							fail: e => {
+								console.log(e);
+							},
+							complete: () => {}
+						});
+						obj.payLoding = false;
+					}
+					//#endif
 					uni.hideLoading();
 					obj.payLoding = false;
 				})
@@ -203,7 +263,7 @@ export default {
 			uni.showLoading({
 				title: '支付中',
 				mask: true
-			})
+			});
 			// 支付中
 			obj.payLoding = true;
 			// #ifdef H5
@@ -224,7 +284,7 @@ export default {
 			let obj = this;
 			// 获取下单页面数据
 			let prepage = obj.$api.prePage();
-
+			console.log(obj.payName,'123456')
 			let data = {
 				real_name: prepage.addressData.real_name, //联系人名称
 				phone: prepage.addressData.phone, //联系人号码

pages/money/recharge.vue

@@ -35,12 +35,24 @@
 			</view>
 		</view> -->
 		<view class="line_box"></view>
-		<view class="cz-type">
-			<view class="type-left">
-				<view class="icon iconfont iconweixin"></view>
-				<view class="tit">微信支付</view>
+		<view class="box">
+		<!-- #ifdef H5 -->
+			<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="type == 'weixin'"></radio></label>
+			</view>
+			<!-- #endif -->
+			<!-- #ifdef APP-PLUS -->
+			<view class="type-item b-b" @click="changePayType(2)">
+				<text class="icon iconfont iconzhifubao"></text>
+				<view class="con"><text class="tit">支付宝支付</text></view>
+				<label class="radio"><radio value="" color="#5dbc7c" :checked="type == 'ali'"></radio></label>
 			</view>
-			<view class="type-right"><image src="https://zhibo.liuniu946.com/img/checked.png" mode=""></image></view>
+			<!-- #endif -->
 		</view>
 		<button class="add-btn up" :class="{ 'active-bg': payLoding }" @click="!payLoding ? confirm() : ''">立即充值</button>
 	</view>
@@ -54,6 +66,9 @@ import { rechargeWechat, rechargeIndex } from '@/api/wallet.js';
 // #ifdef MP
 import { rechargeWechat, rechargeRoutine, rechargeIndex } from '@/api/wallet.js';
 // #endif
+// #ifdef APP-PLUS
+import { rechargeApp, rechargeAli, moneyChong } from '@/api/wallet.js';
+// #endif
 import { mapState } from 'vuex';
 import { spreadCommission, userBalance } from '@/api/wallet.js';
 export default {
@@ -66,7 +81,12 @@ export default {
 	},
 	data() {
 		return {
+			//#ifdef APP-PLUS
+			type: 'ali',
+			//#endif
+			//#ifdef H5
 			type: 'weixin',
+			//#endif
 			money: 300, //充值金额
 			payLoding: false ,//是否加载中
 			list: [
@@ -101,6 +121,15 @@ export default {
 				url: url
 			});
 		},
+		changePayType(types) {
+			const payType = types;
+			if (this.payType == 1) {
+				this.type = 'weixin';
+			}
+			if (this.payType == 2) {
+				this.type = 'ali';
+			}
+		},
 		changeNum() {
 			this.seletNum = this.money = '';
 			console.log(this.seletNum, this.money);
@@ -201,6 +230,61 @@ export default {
 					console.log(e);
 				});
 			// #endif
+			// #ifdef APP-PLUS
+			if (this.type == 'weixin') {
+				rechargeApp({ price: this.money })
+					.then(e => {
+						let da = e.data;
+						let data = {
+							appid: da.appid,
+							noncestr: da.noncestr,
+							package: da.package,
+							partnerid: da.partnerid,
+							prepayid: da.prepayid,
+							timestamp: da.timestamp,
+							sign: da.sign
+						};
+						uni.requestPayment({
+							provider: 'wxpay',
+							orderInfo: data,
+							success(res) {
+								console.log(res);
+							},
+							fail(res) {
+								console.log('微信掉起失败');
+								console.log(res, '失败');
+							}
+						});
+			
+						obj.payLoding = false;
+					})
+					.catch(e => {
+						obj.payLoding = false;
+						console.log(e);
+					});
+			} else {
+				rechargeAli({ price: this.money }).then(e => {
+					console.log(e, 'url');
+					const url = e.msg;
+					uni.requestPayment({
+						provider: 'alipay',
+						orderInfo: url,
+						success: res => {
+							console.log(res);
+							uni.showToast({
+								title: '支付成功',
+								duration: 2000
+							});
+						},
+						fail: e => {
+							console.log(e);
+						},
+						complete: () => {}
+					});
+					obj.payLoding = false;
+				});
+			}
+			// #endif
 		},
 	}
 };
@@ -341,38 +425,6 @@ page {
 		color: #333333;
 	}
 }
-.cz-type {
-	margin-top: 22rpx;
-	display: flex;
-	justify-content: space-between;
-	padding: 32rpx;
-	align-items: center;
-	.type-left {
-		display: flex;
-		align-items: center;
-		.icon {
-			height: 38rpx;
-			image {
-				width: 48rpx;
-				height: 38rpx;
-			}
-		}
-		.iconweixin {
-			color: #36cb59;
-		}
-		.tit {
-			margin-left: 12rpx;
-			font-size: 30rpx;
-			color: #333333;
-		}
-	}
-	.type-right {
-		image {
-			width: 36rpx;
-			height: 36rpx;
-		}
-	}
-}
 .add-btn {
 	&.modified {
 		color: $base-color;
@@ -389,7 +441,7 @@ page {
 	margin: 0 auto;
 	margin-top: 120rpx;
 	font-size: $font-lg;
-	background: linear-gradient(90deg, #08C4E6, #50EAD2);
+	background: linear-gradient(90deg, #08c4e6, #50ead2);
 	box-shadow: 0px 12rpx 45rpx 5rpx rgba(36, 17, 2, 0.04);
 	border-radius: 8rpx;
 }
@@ -476,4 +528,45 @@ page {
 .active-bg {
 	background-color: $color-gray !important;
 }
+.box {
+	margin-top: 20upx;
+	background-color: #fff;
+	padding-left: 60upx;
+}
+.type-item {
+	height: 120upx;
+	padding: 20upx 0;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	padding-right: 60upx;
+	font-size: 30upx;
+	position: relative;
+}
+
+.icon {
+	width: 100upx;
+	font-size: 52upx;
+}
+.iconyue {
+	color: #fe8e2e;
+}
+.iconweixin {
+	color: #36cb59;
+}
+.iconzhifubao {
+	color: #01aaef;
+}
+.tit {
+	font-size: $font-lg;
+	color: $font-color-dark;
+	margin-bottom: 4upx;
+}
+.con {
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	font-size: $font-sm;
+	color: $font-color-light;
+}
 </style>

pages/money/withdrawal.vue

@@ -22,7 +22,7 @@
 				<view class="buttom" @click="withdrawal = money">全部提现</view>
 			</view>
 			<view class="tip" v-if="withdrawal > 0">
-				实际到账{{ realMoney }},剩余{{ integral }}转化为积分
+				实际到账{{ realMoney }},剩余{{ integral }}转化为消费补贴券
 			</view>
 		</view>
 		<view class="list">

pages/money/xfIntegral.vue

@@ -3,7 +3,7 @@
 		<view class="content-money">
 			<view class="money-box">
 				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/img/fanhui.png" mode=""></image></view>
-				<view class="header">我的消费积分</view>
+				<view class="header">我的消费补贴券</view>
 				<image class="money_bg" src="../../static/img/anchor12.png"></image>
 				<view class="money">{{ userInfo.point | getMoneyStyle }}</view>
 			</view>

pages/order/createOrder.vue

@@ -37,7 +37,7 @@
 					<text class="spec">{{ ls.productInfo.attrInfo ? ls.productInfo.attrInfo.suk : '默认' }}</text>
 					<view class="price-box">
 						<text class="price">￥{{ ls.productInfo.attrInfo ? ls.productInfo.attrInfo.price : ls.productInfo.price }}</text>
-						<text class="price" v-if="ls.productInfo.integral > 0 || ls.productInfo.attrInfo.integral > 0">+{{ ls.productInfo.attrInfo ? ls.productInfo.attrInfo.integral : ls.productInfo.integral }}积分</text>
+						<text class="price" v-if="ls.productInfo.integral > 0 || ls.productInfo.attrInfo.integral > 0">+{{ ls.productInfo.attrInfo ? ls.productInfo.attrInfo.integral : ls.productInfo.integral }}消费补贴券</text>
 						<text class="number">{{ 'x ' + ls.cart_num + (ls.productInfo.unit_name || '') }}</text>
 						<!-- <view><text class="price">￥{{lss.price}}</text></view> -->
 						<!-- <view class="number">
@@ -89,11 +89,11 @@
 				<text class="cell-tip">￥{{ payAllMoney }}</text>
 			</view>
 			<view class="yt-list-cell b-b" v-if="moneyAll.totalIntegral > 0">
-				<text class="cell-tit clamp">商品积分</text>
+				<text class="cell-tit clamp">消费补贴券</text>
 				<text class="cell-tip">{{ moneyAll.totalIntegral }}</text>
 			</view>
 			<view class="yt-list-cell b-b" v-if="checkedPoints && integralShow">
-				<text class="cell-tit clamp">积分抵扣</text>
+				<text class="cell-tit clamp">消费补贴券抵扣</text>
 				<text class="cell-tip">-￥{{ integralMoney }}</text>
 			</view>
 			<view class="yt-list-cell b-b" v-if="moneyAll.vipPrice > 0">
@@ -109,7 +109,7 @@
 				<text class="price-tip">￥</text>
 				<text class="price">{{ payPrice }}</text>
 				<text class="price-tip" v-if="payIntegral >0">+</text>
-				<text class="price" v-if="payIntegral >0">{{payIntegral}}积分</text>
+				<text class="price" v-if="payIntegral >0">{{payIntegral}}消费补贴券</text>
 			</view>
 			<text class="submit" :class="{ submitNo: !payType }" @click="payType ? submit() : ''">提交订单</text>
 		</view>

pages/order/orderDetail.vue

@@ -68,7 +68,7 @@
 			<view class="input">-￥{{ item.coupon_price }}</view>
 		</view>
 		<view class="row b-b flex" v-if="item.use_integral > 0">
-			<text class="tit">积分</text>
+			<text class="tit">消费补贴券</text>
 			<view class="input">{{ item.use_integral }}</view>
 		</view>
 		<view class="row b-b flex">

pages/order/orderRefund.vue

@@ -29,7 +29,7 @@
 				<view class="input">-￥{{ item.coupon_price }}</view>
 			</view>
 			<view class="row b-b flex" v-if="item.use_integral > 0">
-				<text class="tit">积分抵扣</text>
+				<text class="tit">消费补贴券抵扣</text>
 				<view class="input">-￥{{ item.use_integral }}</view>
 			</view>
 			<view class="row b-b flex">

pages/product/list.vue

@@ -23,7 +23,7 @@
 				<view class="image-wrapper"><image :src="item.image" mode="aspectFill"></image></view>
 				<text class="title clamp">{{ item.title }}</text>
 				<view class="price-box">
-					<view class="price" v-if="item.integral > 0">￥{{ item.price }} + {{ item.integral }}积分</view>
+					<view class="price" v-if="item.integral > 0">￥{{ item.price }} + {{ item.integral }}消费补贴券</view>
 					<view class="price" v-else>￥{{ item.price }}</view>
 					<text>已售 {{ item.sales }}</text>
 				</view>

pages/product/product.vue

@@ -35,7 +35,7 @@
 				<text class="price-tip">¥</text>
 				<text class="price">{{ goodsObjact.price }}</text>
 				<text class="price-tip" v-if="goodsObjact.integral > 0">+</text>
-				<text class="price" v-if="goodsObjact.integral > 0">{{ goodsObjact.integral }}积分</text>
+				<text class="price" v-if="goodsObjact.integral > 0">{{ goodsObjact.integral }}消费补贴券</text>
 				<text class="m-price" v-if="goodsObjact.ot_price > goodsObjact.price">¥{{ goodsObjact.ot_price }}</text>
 				<!-- <text class="coupon-tip">7折</text> -->
 			</view>
@@ -101,7 +101,7 @@
 				<text class="iconfont iconenter"></text>
 			</view> -->
 			<view class="c-row b-b" v-if="goodsObjact.is_integral == 1 && goodsType == 0">
-				<text class="tit">积分</text>
+				<text class="tit">消费补贴券</text>
 				<view class="bz-list con">
 					<text>最高抵扣￥{{ moneyNum(goodsObjact.use_max_integral) == 0 ? moneyNum(goodsObjact.price) : moneyNum(goodsObjact.use_max_integral) }}</text>
 				</view>
@@ -164,7 +164,7 @@
 					<image :src="actionImage"></image>
 					<view class="right">
 						<view class="good-name clamp">{{ goodsObjact.store_name }}</view>
-						<text class="price" v-if="actionIntegral != 0">¥{{ actionPrice }}+{{actionIntegral}}积分</text>
+						<text class="price" v-if="actionIntegral != 0">¥{{ actionPrice }}+{{actionIntegral}}消费补贴券</text>
 						<text class="price" v-else>¥{{ actionPrice }}</text>
 						<!-- <text class="stock">库存：{{ goodsObjact.stock }}件</text> -->
 						<!-- <view class="selected" v-if="goodsType == 0">

pages/product/search.vue

@@ -48,7 +48,7 @@
 							<view class="price margin-c-20 flex">
 								<view v-if="item.integral > 0">
 									<text class="font-size-sm ">￥</text>
-									{{ item.price }} + {{ item.integral }}积分
+									{{ item.price }} + {{ item.integral }}消费补贴券
 								</view>
 								<view v-else>
 									<text class="font-size-sm ">￥</text>

pages/product/vipProduct.vue

@@ -64,7 +64,7 @@
 				<text class="iconfont iconenter"></text>
 			</view>
 			<view class="c-row" >
-				<text  style="width: 100%;">购买获得{{goodsObjact.point}}消费积分</text>
+				<text  style="width: 100%;">购买获得{{goodsObjact.point}}消费补贴券</text>
 			</view>
 			<view class="c-row b-b" v-if="goodsType == 1">
 				<text class="tit">限购数量</text>
@@ -78,7 +78,7 @@
 				<text class="iconfont iconenter"></text>
 			</view> -->
 			<view class="c-row b-b" v-if="goodsObjact.is_integral == 1 && goodsType == 0">
-				<text class="tit">积分</text>
+				<text class="tit">消费补贴券</text>
 				<view class="bz-list con">
 					<text>最高抵扣￥{{ moneyNum(goodsObjact.use_max_integral) == 0 ? moneyNum(goodsObjact.price) : moneyNum(goodsObjact.use_max_integral) }}</text>
 				</view>
@@ -121,7 +121,7 @@
 					<view class="right">
 						<view class="good-name clamp">{{ goodsObjact.store_name }}</view>
 						<text class="price">¥{{ actionPrice }}</text>
-						<text class="tip">购买可得{{ actionPoint }}消费积分</text>
+						<text class="tip">购买可得{{ actionPoint }}消费补贴券</text>
 						<!-- <text class="stock">库存：{{ goodsObjact.stock }}件</text> -->
 						<!-- <view class="selected" v-if="goodsType == 0">
 							已选：

pages/public/login.vue

@@ -26,11 +26,11 @@
 			<view class="fenge"></view>
 		</view> -->
 		<!-- #ifndef APP-PLUS -->
-		<view class="weixin" @click="wecahtLogin('weixin')"><image src="/static/img/login-weixin.png"></image></view>
-		<view class="weixin_text" @click="wecahtLogin('weixin')">微信登录</view>
+		<!-- <view class="weixin" @click="wecahtLogin('weixin')"><image src="/static/img/login-weixin.png"></image></view>
+		<view class="weixin_text" @click="wecahtLogin('weixin')">微信登录</view> -->
 		<!-- #endif -->
 		<!-- #ifdef APP-PLUS -->
-		<block v-if="!is_ios">
+		<!-- <block v-if="!is_ios">
 			<view class="weixin" @click="wecahtLogin('weixin')"><image src="/static/img/login-weixin.png" mode="scaleToFill"></image></view>
 			<view class="weixin_text" @click="wecahtLogin('weixin')">微信登录</view>
 		</block>
@@ -43,7 +43,7 @@
 				<image class="loginIcon" src="/static/static/icon/appleIcon.png" mode=" scaleToFill"></image>
 				<text class="weixin_text">通过Apple登录</text>
 			</view>
-		</block>
+		</block> -->
 		<!-- #endif -->
 	</view>
 </template>

pages/public/register.vue

@@ -84,10 +84,10 @@ export default {
 				obj.$api.msg('请输入验证码');
 				return;
 			}
-			if (obj.invitation == '') {
-				obj.$api.msg('请输入邀请码');
-				return;
-			}
+			// if (obj.invitation == '') {
+			// 	obj.$api.msg('请输入邀请码');
+			// 	return;
+			// }
 			register({
 				account: obj.phone, //账号
 				captcha: obj.code, //验证码

pages/user/favorites.vue

@@ -8,7 +8,7 @@
 				<view class="favorites_name">{{ ls.store_name }}</view>
 				<view class="favorites_peice flex">
 					<view>
-						<text v-if="ls.integral != 0">￥{{ ls.price }} + {{ ls.integral }}积分</text>
+						<text v-if="ls.integral != 0">￥{{ ls.price }} + {{ ls.integral }}消费补贴券</text>
 						<text v-else>￥{{ ls.price }}</text>
 					</view>
 					<view class="icon_del" @click.prevent.stop="del(ls.pid)" v-show="delshow">

pages/user/user.vue

@@ -3,6 +3,11 @@
 		<scroll-view class="content-box" scroll-y="true">
 			<view class="user-section">
 				<view class="bg"><image src="/static/img/user-bg.png" mode=""></image></view>
+				<!-- #ifdef APP-PLUS -->
+					<view class="top">
+						
+					</view>
+				<!-- #endif -->
 				<view class="user-info-box ">
 					<view class="detail flex">
 						<view class="portrait-box" @click="navTo('/pages/set/userinfo')">
@@ -25,79 +30,64 @@
 					</view>
 				</view>
 			</view>
-			<!-- 订单 -->
-			<view class="item-box item-box-b">
-				<view class="box-title flex borde-b">
-					<view class="title"><text>我的订单</text></view>
+			<view class="box">
+				<view class="sweets-box">
+					<view class="sweets" @click="navTo('/pages/money/xfIntegral')">
+						<view class="limit">{{  userInfo.point*1 || 0 }}</view>
+						<view class="sweets-name">消费补贴券</view>
+					</view>
+					<view class="jiange"></view>
+					<view class="sweets" @click="navTo('/pages/user/award')">
+						<view class="limit">{{ money * 1 || 0 }}</view>
+						<view class="sweets-name">余额</view>
+					</view>
+					<view class="jiange"></view>
+					<view class="sweets" @click="navTo('/pages/money/wallet')">
+						<view class="limit">{{ userInfo.brokerage_price*1 }}</view>
+						<view class="sweets-name">佣金</view>
+					</view>
+					<view class="jiange"></view>
+					<view class="sweets" @click="navTo('/pages/money/integral')">
+						<view class="limit">{{ userInfo.integral * 1 || 0 }}</view>
+						<view class="sweets-name">消费补贴券</view>
+					</view>
+				</view>
+			</view>
+			<view class="my-order">
+				<view class="box-title flex ">
+					<view class="title1"><text>商城订单</text></view>
 					<view class="link" @click="navTo('/pages/order/order?state=0')" hover-class="common-hover"><text class="iconfont iconenter"></text></view>
 				</view>
 				<view class="order-section">
 					<view class="order-item" @click="navTo('/pages/order/order?state=0')" hover-class="common-hover" :hover-stay-time="50">
-						<view class=" icon position-relative">
-							<image class="icon-img" src="/static/user/order1.png" mode="aspectFit"></image>
-							<view class="corner" v-if="orderInfo.unpaid_count > 0">
-								<text>{{ orderInfo.unpaid_count }}</text>
-							</view>
-						</view>
+						<view class=" icon1 position-relative"><image class="icon-img" src="/static/user/order1.png" mode="aspectFit"></image></view>
 						<text>待付款</text>
 					</view>
 					<view class="order-item" @click="navTo('/pages/order/order?state=1')" hover-class="common-hover" :hover-stay-time="50">
-						<view class=" icon position-relative">
-							<image class="icon-img" src="/static/user/order2.png" mode="aspectFit"></image>
-							<view class="corner" v-if="orderInfo.unshipped_count > 0">
-								<text>{{ orderInfo.unshipped_count }}</text>
-							</view>
-						</view>
+						<view class="icon1 position-relative"><image class="icon-img" src="/static/user/order2.png" mode="aspectFit"></image></view>
 						<text>待发货</text>
 					</view>
 					<view class="order-item" @click="navTo('/pages/order/order?state=2')" hover-class="common-hover" :hover-stay-time="50">
-						<view class="icon position-relative">
-							<image class="icon-img" src="/static/user/order3.png" mode="aspectFit"></image>
-							<view class="corner" v-if="orderInfo.received_count > 0">
-								<text>{{ orderInfo.received_count }}</text>
-							</view>
-						</view>
+						<view class="icon1 position-relative"><image class="icon-img" src="/static/user/order3.png" mode="aspectFit"></image></view>
 						<text>待收货</text>
 					</view>
 					<view class="order-item" @click="navTo('/pages/order/order?state=4')" hover-class="common-hover" :hover-stay-time="50">
-						<view class="icon position-relative"><image class="icon-img" src="/static/user/order4.png" mode="aspectFit"></image></view>
+						<view class=" icon1 position-relative"><image class="icon-img" src="/static/user/order4.png" mode="aspectFit"></image></view>
 						<text>已完成</text>
 					</view>
 				</view>
 			</view>
-			<view>
-				<view class="item-box item-box-a">
-					<view class="order-section">
-						<view class="order-item" @click="navTo('/pages/money/xfIntegral')" hover-class="common-hover" :hover-stay-time="50">
-							<view class="icon icon-b"><image class="icon-img" src="/static/user/yue.png" mode="aspectFit"></image></view>
-							<view class="order-font">消费积分</view>
-						</view>
-						<view class="order-item" @click="navTo('/pages/user/award')" hover-class="common-hover" :hover-stay-time="50">
-							<view class="icon icon-b"><image class="icon-img" src="/static/user/yongjin.png" mode="aspectFit"></image></view>
-							<view class="order-font">余额</view>
-						</view>
-						<view class="order-item" @click="navTo('/pages/money/wallet')" hover-class="common-hover" :hover-stay-time="50">
-							<view class="icon icon-b"><image class="icon-img" src="/static/user/yaoqing.png" mode="aspectFit"></image></view>
-							<view class="order-font">佣金</view>
-						</view>
-						<view class="order-item" @click="navTo('/pages/money/integral')" hover-class="common-hover" :hover-stay-time="50">
-							<view class="icon icon-b"><image class="icon-img" src="/static/user/tuiguang.png" mode="aspectFit"></image></view>
-							<view class="order-font">商城积分</view>
-						</view>
-					</view>
-				</view>
-				<view class="history-section icon">
-					<uni-list>
-						<uni-list-item title="我的收藏" @click="navTo('/pages/user/favorites')" thumb="/static/user/shoucang.png"></uni-list-item>
-						<uni-list-item title="收货地址" @click="navTo('/pages/set/address')" thumb="/static/user/dizhi.png"></uni-list-item>
-						<!-- <uni-list-item title="联系客服" @click="showPopup" thumb="/static/user/kefu.png"></uni-list-item> -->
-						<uni-list-item title="绑定手机号" @click="navTo('/pages/set/phone')" thumb="/static/user/kefu.png"></uni-list-item>
-						<uni-list-item title="分享海报" @click="navTo('/pages/user/shareQrCode')" thumb="/static/user/share.png"></uni-list-item>
-						<uni-list-item title="我的推广" @click="navTo('/pages/user/team')" thumb="/static/user/team.png"></uni-list-item>
-						<uni-list-item title="会员协议" @click="navTo('/pages/contract/agreement')" thumb="/static/user/vipxy.png"></uni-list-item>
-						<uni-list-item title="隐私政策" @click="navTo('/pages/contract/privacy')" thumb="/static/user/yszc.png"></uni-list-item>
-					</uni-list>
-				</view>
+			<view class="history-section icon">
+				<uni-list>
+					<uni-list-item title="我的收藏" @click="navTo('/pages/user/favorites')" thumb="/static/user/shoucang.png"></uni-list-item>
+					<uni-list-item title="收货地址" @click="navTo('/pages/set/address')" thumb="/static/user/dizhi.png"></uni-list-item>
+					<!-- <uni-list-item title="联系客服" @click="showPopup" thumb="/static/user/kefu.png"></uni-list-item> -->
+					<uni-list-item title="绑定手机号" @click="navTo('/pages/set/phone')" thumb="/static/user/kefu.png"></uni-list-item>
+					<uni-list-item title="分享海报" @click="navTo('/pages/user/shareQrCode')" thumb="/static/user/share.png"></uni-list-item>
+					<uni-list-item title="我的推广" @click="navTo('/pages/user/team')" thumb="/static/user/team.png"></uni-list-item>
+					<uni-list-item title="会员协议" @click="navTo('/pages/contract/agreement')" thumb="/static/user/vipxy.png"></uni-list-item>
+					<uni-list-item title="隐私政策" @click="navTo('/pages/contract/privacy')" thumb="/static/user/yszc.png"></uni-list-item>
+				</uni-list>
 			</view>
 		</scroll-view>
 		<uni-popup ref="popup" type="center">
@@ -120,9 +110,10 @@
 </template>
 <script>
 import { mapState, mapMutations } from 'vuex';
+import { spreadCommission, userBalance } from '@/api/wallet.js';
 import uniList from '@/components/uni-list/uni-list.vue';
 import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
-import { orderData, getUserInfo,service } from '@/api/user.js';
+import { orderData, getUserInfo, service } from '@/api/user.js';
 import { saveUrl, interceptor } from '@/utils/loginUtils.js';
 import { logout } from '@/api/set.js';
 // import uniCopy from '@/js_sdk/xb-copy/uni-copy.js';
@@ -141,13 +132,16 @@ export default {
 			moving: false,
 			erweima: '',
 			weixin: '',
+			money:'',
 		};
 	},
 	onShow() {
 		// 判断是否已经登录
 		if (this.hasLogin) {
 			this.loadBaseData();
-			
+			userBalance({}).then(({ data }) => {
+				this.money = data.now_money;
+			});
 		}
 	},
 	onReady() {
@@ -269,7 +263,6 @@ export default {
 			}
 			this.$refs.popup.close();
 		},
-		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
 		// 加载初始数据
 		loadBaseData() {
 			getUserInfo({})
@@ -314,7 +307,7 @@ export default {
 					url
 				});
 			}
-		},
+		}
 	}
 };
 </script>
@@ -368,7 +361,9 @@ page {
 		}
 	}
 }
-
+.top {
+	height: 50rpx;
+}
 .user-info-box {
 	height: 180rpx;
 	color: white;
@@ -481,59 +476,138 @@ page {
 		}
 	}
 }
-
-.vip-card-box {
+.box {
 	display: flex;
 	flex-direction: column;
-	color: #f7d680;
-	height: 240rpx;
-	background: linear-gradient(left, rgba(0, 0, 0, 0.7), rgba(0, 0, 0, 0.8));
-	border-radius: 16rpx 16rpx 0 0;
-	overflow: hidden;
+	width: 710rpx;
 	position: relative;
-	padding: 20rpx 24rpx;
+	margin: -80rpx 20rpx;
+	color: #fefefe;
+}
+.my-order {
+	margin: 100rpx auto 0;
+	display: flex;
+	justify-content: space-between;
+	flex-direction: column;
+	width: 710rpx;
+	background: #ffffff;
+	box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(50, 50, 52, 0.06);
+	border-radius: 20rpx;
+}
+.box-title {
+	border-top-left-radius: 20rpx;
+	border-top-right-radius: 20rpx;
+	background-color: #ffffff;
+	line-height: 1;
+	padding: 26rpx 34rpx 20rpx;
+	border-bottom: 1px solid #f5f5f5;
+
+	.title1 {
+		font-size: 30rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #333333;
+	}
 
-	.card-bg {
-		position: absolute;
-		top: 20rpx;
-		right: 0;
-		width: 380rpx;
-		height: 260rpx;
+	.link {
+		font-size: $font-base - 2rpx;
+		color: $font-color-light;
+	}
+}
+.order-section {
+	display: flex;
+	flex-wrap: wrap;
+	align-items: center;
+	text-align: center;
+	padding: 34rpx 0 10rpx;
+	.order-item {
+		display: flex;
+		flex-direction: column;
+		width: 25%;
+		align-items: center;
+		height: 140rpx;
+		font-size: $font-sm;
+		color: $font-color-dark;
 	}
 
-	.b-btn {
-		position: absolute;
-		right: 20rpx;
-		top: 16rpx;
-		width: 132rpx;
-		height: 40rpx;
-		text-align: center;
-		line-height: 40rpx;
-		font-size: 22rpx;
-		color: #36343c;
-		border-radius: 20px;
-		background: linear-gradient(left, #f9e6af, #ffd465);
-		z-index: 1;
+	.iconfont {
+		font-size: 48rpx;
+		margin-bottom: 18rpx;
+		color: #fa436a;
 	}
 
-	.tit {
-		font-size: $font-base + 2rpx;
-		color: #f7d680;
-		margin-bottom: 28rpx;
+	.icon-shouhoutuikuan {
+		font-size: 44rpx;
+	}
 
-		.iconfont {
-			color: #f6e5a3;
-			margin-right: 16rpx;
+	.icon {
+		height: 88rpx;
+		width: 90rpx;
+		margin-bottom: 18rpx;
+		background-size: 100%;
+		background-repeat: no-repeat;
+		background-position: center;
+
+		.icon-img {
+			width: 100%;
+			height: 100%;
 		}
 	}
 
-	.e-b {
-		font-size: $font-sm;
-		color: #d8cba9;
-		margin-top: 10rpx;
+	.icon1 {
+		height: 50rpx;
+		width: 48rpx;
+		margin-bottom: 18rpx;
+		background-size: 100%;
+		background-repeat: no-repeat;
+		background-position: center;
+
+		.icon-img {
+			width: 100%;
+			height: 100%;
+		}
 	}
 }
 
+.sweets-box {
+	display: flex;
+	align-items: center;
+	width: 710rpx;
+	padding: 48rpx 0;
+	background: #ffffff;
+	box-shadow: 0px 0px 20px 0px rgba(50, 50, 52, 0.06);
+	border-radius: 20rpx;
+
+	.jiange {
+		width: 1rpx;
+		height: 36rpx;
+		background: #999999;
+	}
+
+	.sweets {
+		width: 25%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		font-size: 28rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+
+		.limit {
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #ff0000;
+		}
+
+		.sweets-name {
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #666666;
+		}
+	}
+}
 .cover-container {
 	background: $page-color-base;
 	margin-top: -150rpx;
@@ -569,86 +643,6 @@ page {
 	}
 }
 
-.item-box {
-	// width: 710rpx;
-	// height: 221rpx;
-	// background: #FFFFFF;
-	// box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-	// border-radius: 20rpx;
-	// position: relative;
-	// top: -150rpx;
-	// left: 0;
-	// right: 0;
-	// margin: 0 auto -150rpx;
-	margin: 20rpx 0;
-
-	.box-title {
-		background-color: #fff;
-		line-height: 1;
-		// padding: 30rpx;
-		padding: 0 36rpx 0 35rpx;
-		height: 73rpx;
-		border-radius: 20rpx 20rpx 0 0;
-
-		.title {
-			font-weight: bold;
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #333333;
-		}
-
-		.link {
-			font-size: $font-base - 2rpx;
-			color: $font-color-light;
-		}
-	}
-
-	.order-section {
-		height: 146rpx;
-		@extend %section;
-
-		// padding: 28rpx 0;
-		.order-item {
-			@extend %flex-center;
-			width: 120rpx;
-			height: 146rpx;
-			border-radius: 10rpx;
-			font-size: $font-sm;
-			color: $font-color-dark;
-		}
-
-		.iconfont {
-			font-size: 48rpx;
-			margin-bottom: 18rpx;
-			color: #fa436a;
-		}
-
-		.icon-shouhoutuikuan {
-			font-size: 44rpx;
-		}
-
-		.icon {
-			height: 50rpx;
-			width: 48rpx;
-			margin-bottom: 18rpx;
-			background-size: 100%;
-			background-repeat: no-repeat;
-			background-position: center;
-
-			.icon-img {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		.icon-b {
-			height: 90rpx;
-			width: 88rpx;
-		}
-	}
-}
-
 .history-section {
 	// padding: 30rpx 0 0;
 	margin-top: 20rpx;

unpackage/cache/apk/apkurl

@@ -0,0 +1 @@
+https://ide.dcloud.net.cn/build/download/654164c0-79cd-11ec-94eb-057e4816a5a8

unpackage/cache/certdata

@@ -0,0 +1,3 @@
+andrCertfile=D:/工作/项目2/和合商城/hhsc/unpackage/证书/hhsc.keystore
+andrCertAlias=com.hhsc.inc
+andrCertPass=ep/Tdjka4Y7WYqDB6/S7dw==

unpackage/cache/wgt/__UNI__F920061/__uniappview.html

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+  <head>
+    <meta charset="UTF-8" />
+    <script>
+      var __UniViewStartTime__ = Date.now();
+      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>
+    <title>View</title>
+    <link rel="stylesheet" href="view.css" />
+  </head>
+
+  <body>
+    <div id="app"></div>
+    <script src="__uniappes6.js"></script>
+    <script src="view.umd.min.js"></script>
+    <script src="app-view.js"></script>
+  </body>
+
+</html>

unpackage/cache/wgt/__UNI__F920061/app-config.js

@@ -0,0 +1 @@
+(function(e){function r(r){for(var n,l,i=r[0],p=r[1],a=r[2],c=0,s=[];c<i.length;c++)l=i[c],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in p)Object.prototype.hasOwnProperty.call(p,n)&&(e[n]=p[n]);f&&f(r);while(s.length)s.shift()();return u.push.apply(u,a||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,i=1;i<t.length;i++){var p=t[i];0!==o[p]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={"app-config":0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e["default"]}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="/";var i=this["webpackJsonp"]=this["webpackJsonp"]||[],p=i.push.bind(i);i.push=r,i=i.slice();for(var a=0;a<i.length;a++)r(i[a]);var f=p;t()})([]);

unpackage/cache/wgt/__UNI__F920061/static/css/cmy.css

@@ -0,0 +1,551 @@
+/*初始化类*/
+@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;
+}