123456

manifest.json

@@ -1,87 +1,87 @@
 {
-	"name": "芊扦龙虾",
-	"appid": "__UNI__490E406",
-	"description": "",
-	"versionName": "1.0.0",
-	"versionCode": "100",
-	"transformPx": false,
-	"app-plus": {
-		/* 5+App特有相关 */
-		"usingComponents": true,
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		"modules": {},
-		/* 模块配置 */
-		"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.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.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>"
-				],
-				"abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"]
-			},
-			"ios": {
-				"idfa": false
-			},
-			/* ios打包配置 */
-			"sdkConfigs": {
-				"maps": {},
-				"oauth": {
-					"weixin": {
-						"appid": "",
-						"appsecret": "",
-						"UniversalLinks": ""
-					}
-				}
-			}
-		}
-	},
-	/* SDK配置 */
-	"quickapp": {},
-	/* 快应用特有相关 */
-	"mp-weixin": {
-		/* 小程序特有相关 */
-		"usingComponents": true,
-		"appid": "wxa97aaa27a9ae6c7c",
-		"setting": {
-			"urlCheck": true,
-			"minified": true
-		}
-	},
-	"h5": {
-		"title": "芊扦龙虾",
-		"domain": "",
-		"router": {
-			"base": "/index/",
-			"mode": "hash"
-		},
-		"devServer": {
-			"proxy": {
-				"/api": {
-					"target": "http://longxia.frp.liuniu946.com/api",
-					// "target": "http://www.tingjiu.liuniukj.com/api",
-					// "changeOrigin": true,
-					"pathRewrite": {
-						"/api": "" // rewrite path
-					}
-				}
-			}
-		}
-	}
-}
+    "name" : "芊扦龙虾",
+    "appid" : "__UNI__490E406",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    "app-plus" : {
+        /* 5+App特有相关 */
+        "usingComponents" : true,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        "modules" : {},
+        /* 模块配置 */
+        "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.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.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>"
+                ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
+            },
+            "ios" : {
+                "idfa" : false
+            },
+            /* ios打包配置 */
+            "sdkConfigs" : {
+                "maps" : {},
+                "oauth" : {
+                    "weixin" : {
+                        "appid" : "",
+                        "appsecret" : "",
+                        "UniversalLinks" : ""
+                    }
+                }
+            }
+        }
+    },
+    /* SDK配置 */
+    "quickapp" : {},
+    /* 快应用特有相关 */
+    "mp-weixin" : {
+        /* 小程序特有相关 */
+        "usingComponents" : true,
+        "appid" : "wxa97aaa27a9ae6c7c",
+        "setting" : {
+            "urlCheck" : true,
+            "minified" : true
+        }
+    },
+    "h5" : {
+        "title" : "芊扦龙虾",
+        "domain" : "",
+        "router" : {
+            "base" : "/index/",
+            "mode" : "hash"
+        },
+        "devServer" : {
+            "proxy" : {
+                "/api" : {
+                    "target" : "http://qqlx.liuniukj.com/api",
+                    // "target": "http://www.tingjiu.liuniukj.com/api",
+                    // "changeOrigin": true,
+                    "pathRewrite" : {
+                        "/api" : "" // rewrite path
+                    }
+                }
+            }
+        }
+    }
+}

pages.json

@@ -181,9 +181,13 @@
 		{
 			"path": "pages/user/yue",
 			"style": {
-				"navigationBarTitleText": "我的钱包",
-				"navigationBarBackgroundColor": "#ff4c4c",
-				"navigationBarTextStyle": "white"
+				"navigationBarTitleText": "我的消费金",
+				"navigationStyle": "custom",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
 
 			}
 		},

pages/index/index.vue

@@ -28,7 +28,7 @@
 				</view>
 				<view class="item-title">产品中心</view>
 			</view>
-			<view class="cate-item flex" @click="navto('/pages/index/artDetail?id=2')">
+			<view class="cate-item flex" @click="navto('/pages/index/artDetail?id=1')">
 				<view class="img-wrapper flex">
 					<image src="../../static/icon/in2.png" mode=""></image>
 				</view>
@@ -40,14 +40,14 @@
 				</view>
 				<view class="item-title">联系客服</view>
 			</view>
-			<view class="cate-item flex" @click="navto('/pages/user/shareQrCode')">
+			<view class="cate-item flex" @click="navto('/pages/user/shareQrCode',1)">
 				<view class="img-wrapper flex">
 					<image src="../../static/icon/in4.png" mode=""></image>
 				</view>
 				<view class="item-title">邀请好友</view>
 			</view>
 		</view>
-		<view class="tongz">
+		<view class="tongz" v-if="text1.length !=0">
 			<view class="tongz-left flex">
 				<view class="left">
 					<image class="image-left" src="../../static/img/tong.png" mode=""></image>
@@ -68,7 +68,7 @@
 				<view class="hx"></view>
 			</view>
 		</view>
-		<view class="good-list">
+		<view class="good-list" v-if="firstList.length > 0">
 			<view class="good flex" v-for="item in firstList" @click="navto('/pages/product/product?id=' + item.id)">
 				<view class="good-img">
 					<image :src="item.image" mode=""></image>
@@ -88,7 +88,6 @@
 					</view>
 				</view>
 			</view>
-			<uni-load-more :status="loadingType"></uni-load-more>
 		</view>
 		<!-- 商品列表 ed-->
 		<view class="jg" v-if="goodList.length > 0"></view>
@@ -112,11 +111,11 @@
 		<view class="product-box" v-if="goodList.length > 0">
 			<view class="hotgoods">
 				<view class="hotgoods-item" v-for="item in goodList" :key="item.id"
-					@click="navto('/pages/product/product?id=' + item.id)" style="height: 520rpx;">
+					@click="navto('/pages/product/product?id=' + item.id+'&isvip=1')" style="height: 520rpx;">
 					<view class="image-wrapper">
 						<image class="image" :src="item.image" mode="scaleToFill"></image>
 						<view class="give-jf">
-							赠{{item.give_award_range *1}}消费金
+							赠{{item.give_money *1}}消费金
 						</view>
 					</view>
 					<view class="flex"
@@ -189,7 +188,7 @@
 			return {
 				text1: [],
 				article: [],
-				text: 'tingjiu1688', //客服微信
+				text: '', //客服微信
 				page: 1,
 				limit: 10,
 				loadingType: 'more',
@@ -249,7 +248,7 @@
 				groomList({
 					page: obj.page,
 					limit: obj.limit,
-				}, 5).then(res => {
+				}, 6).then(res => {
 					obj.goodList = obj.goodList.concat(res.data.list);
 					if (obj.limit == res.data.length) {
 						obj.page++;

pages/money/pay.vue

@@ -11,22 +11,35 @@
 					<text class="tit">微信支付</text>
 					<text>推荐使用微信支付</text>
 				</view>
-				<label class="radio"><radio value="" color="#5dbc7c" :checked="payType == 1"></radio></label>
+				<label class="radio">
+					<radio value="" color="#5dbc7c" :checked="payType == 1"></radio>
+				</label>
 			</view>
 			<!-- #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="payType == 2"></radio></label>
+				<label class="radio">
+					<radio value="" color="#5dbc7c" :checked="payType == 2"></radio>
+				</label>
 			</view>
 			<!-- #endif -->
-			<view class="type-item" @click="changePayType(3)">
+			<view class="type-item b-b" @click="changePayType(4)">
+				<image class="pay-icon" src="../../static/icon/xxzf.png" mode=""></image>
+				<view class="con"><text class="tit">线下支付</text></view>
+				<label class="radio">
+					<radio value="" color="#5dbc7c" :checked="payType == 4"></radio>
+				</label>
+			</view>
+			<view class="type-item" @click="changePayType(3)" v-if="isvip !=1">
 				<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>
+				<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>
@@ -34,358 +47,403 @@
 </template>
 
 <script>
-import { balance } from '@/api/wallet.js';
-import { createOrderkey, computedOrderkey, orderPay } from '@/api/order.js';
-import { mapState } from 'vuex';
-// #ifdef H5
-import weichatObj from '@/plugin/jweixin-module/index.js';
-// #endif
-export default {
-	data() {
-		return {
-			payType: 1, //支付类型
-			// #ifdef H5
-			payName: 'weixin',
-			// #endif
-			// #ifdef MP-WEIXIN
-			payName: 'weixin',
-			// #endif
-			orderInfo: {},
-			money: 0.0, //订单金额
-			now_money: 0.0, //余额
-			orderKey: '',
-			orderId: '', //保存订单id
-			payLoding: false, //判断是否支付中
-			type: '', //判断是否从订单中进入
+	import {
+		balance
+	} from '@/api/wallet.js';
+	import {
+		createOrderkey,
+		computedOrderkey,
+		orderPay
+	} from '@/api/order.js';
+	import {
+		mapState
+	} from 'vuex';
+	// #ifdef H5
+	import weichatObj from '@/plugin/jweixin-module/index.js';
+	// #endif
+	export default {
+		data() {
+			return {
+				payType: 1, //支付类型
+				// #ifdef H5
+				payName: 'weixin',
+				// #endif
+				// #ifdef MP-WEIXIN
+				payName: 'weixin',
+				// #endif
+				orderInfo: {},
+				money: 0.0, //订单金额
+				now_money: 0.0, //余额
+				orderKey: '',
+				orderId: '', //保存订单id
+				payLoding: false, //判断是否支付中
+				type: '', //判断是否从订单中进入
+				// #ifdef H5
+				froms: '', //保存h5中数据来源对象
+				// #endif
+				pinkid: '', //保存拼团商品id
+				isvip: 0
+			};
+		},
+		computed: {
 			// #ifdef H5
-			froms: '', //保存h5中数据来源对象
+			...mapState(['weichatObj']),
 			// #endif
-			pinkid: '' //保存拼团商品id
-		};
-	},
-	computed: {
-		// #ifdef H5
-		...mapState(['weichatObj']),
-		// #endif
-		...mapState('user', ['userInfo'])
-	},
-	onLoad(options) {
-		if (options.type == 1) {
-			this.type = 1;
-			this.orderId = options.ordid;
-			this.money = options.money;
-		} else {
-			this.orderKey = options.key;
-			let prepage = this.$api.prePage();
-			computedOrderkey({
-				orderkey: this.orderKey,
-				couponId: prepage.couponChecked.id, //优惠券编号
-				addressId: prepage.addressData.id, //地址编号
-				useIntegral: prepage.checkedPoints ? 1 : 0
-			}).then(({ data }) => {
-				// 获取支付金额
-				this.money = data.result.pay_price;
-			});
-		}
-		// 保存pinkid
-		if (options.pinkid) {
-			this.pinkid = options.pinkid;
-		}
-		// 载入余额
-		balance({}).then(({ data }) => {
-			// 获取余额
-			this.now_money = data.now_money;
-		});
-	},
-	methods: {
-		//选择支付方式
-		changePayType(type) {
-			this.payType = type;
-			if (this.payType == 1) {
-				this.payName = 'weixin';
+			...mapState('user', ['userInfo'])
+		},
+		onLoad(options) {
+			if (options.isvip) {
+				this.isvip = options.isvip
 			}
-			if (this.payType == 2) {
-				this.payName = 'ali';
+			if (options.type == 1) {
+				this.type = 1;
+				this.orderId = options.ordid;
+				this.money = options.money;
+			} else {
+				this.orderKey = options.key;
+				let prepage = this.$api.prePage();
+				computedOrderkey({
+					orderkey: this.orderKey,
+					couponId: prepage.couponChecked.id, //优惠券编号
+					addressId: prepage.addressData.id, //地址编号
+					useIntegral: prepage.checkedPoints ? 1 : 0
+				}).then(({
+					data
+				}) => {
+					// 获取支付金额
+					this.money = data.result.pay_price;
+				});
 			}
-			if (this.payType == 3) {
-				this.payName = 'yue';
+			// 保存pinkid
+			if (options.pinkid) {
+				this.pinkid = options.pinkid;
 			}
+			// 载入余额
+			balance({}).then(({
+				data
+			}) => {
+				// 获取余额
+				this.now_money = data.now_money;
+			});
 		},
-		// 支付金额
-		orderMoneyPay() {
-			let obj = this;
-			console.log('支付金额');
-			orderPay({
-				uni: obj.orderId,
-				// #ifdef H5
-				from: obj.froms ? 'weixin' : 'H5', //来源
-				// #endif
-				// #ifdef MP-WEIXIN
-				from: 'routine', //来源
-				// #endif
-				// #ifdef APP-PLUS
-				from: 'app', //来源
-				// #endif
-				paytype: obj.payName //支付类型  weixin-微信 yue-余额
-			})
-				.then(e => {
-					console.log(obj.payName, '支付类型');
-					console.log(e, '支付金额');
-					// 判断是否为余额支付
-					if (obj.payName == 'yue' && e.data.status == 'SUCCESS') {
-						if (e.status == 200) {
-							obj.paySuccessTo();
-						} else {
-							obj.$api.msg(msg);
+		methods: {
+			//选择支付方式
+			changePayType(type) {
+				this.payType = type;
+				if (this.payType == 1) {
+					this.payName = 'weixin';
+				}
+				if (this.payType == 2) {
+					this.payName = 'ali';
+				}
+				if (this.payType == 3) {
+					this.payName = 'yue';
+				}
+				if (this.payType == 4) {
+					this.payName = 'offline';
+				}
+			},
+			// 支付金额
+			orderMoneyPay() {
+				let obj = this;
+				console.log('支付金额');
+				orderPay({
+						uni: obj.orderId,
+						// #ifdef H5
+						from: obj.froms ? 'weixin' : 'H5', //来源
+						// #endif
+						// #ifdef MP-WEIXIN
+						from: 'routine', //来源
+						// #endif
+						// #ifdef APP-PLUS
+						from: 'app', //来源
+						// #endif
+						paytype: obj.payName //支付类型  weixin-微信 yue-余额
+					})
+					.then(e => {
+						console.log(obj.payName, '支付类型');
+						console.log(e, '支付金额');
+						// 判断是否为余额支付
+						if (obj.payName == 'yue' && e.data.status == 'SUCCESS') {
+							if (e.status == 200) {
+								obj.paySuccessTo();
+							} else {
+								obj.$api.msg(msg);
+							}
 						}
-					}
-					if (obj.payName == 'weixin' || obj.payName == 'routine') {
-						let da = e.data.result.jsConfig;
-						let data = {
-							// #ifdef H5
-							timestamp: da.timestamp,
-							// #endif
-							// #ifdef MP
-							timeStamp: da.timestamp,
-							// #endif
-							nonceStr: da.nonceStr,
-							package: da.package,
-							signType: da.signType,
-							paySign: da.paySign,
-							success: function(res) {
+						if (obj.payName == 'offline' && e.data.status == 'SUCCESS') {
+							if (e.status == 200) {
 								obj.paySuccessTo();
-							},
-							fail: () => {
-								uni.navigateTo({
-									url: '/pages/order/order?state=0'
-								});
+							} else {
+								obj.$api.msg(msg);
 							}
-						};
-						// #ifdef H5
-						if (obj.payName == 'weixin') {
-							weichatObj.chooseWXPay(data);
 						}
-						// #endif
-						// #ifdef MP-WEIXIN
 						if (obj.payName == 'weixin' || obj.payName == 'routine') {
-							console.log('开始支付');
-							wx.requestPayment(data);
+							let da = e.data.result.jsConfig;
+							let data = {
+								// #ifdef H5
+								timestamp: da.timestamp,
+								// #endif
+								// #ifdef MP
+								timeStamp: da.timestamp,
+								// #endif
+								nonceStr: da.nonceStr,
+								package: da.package,
+								signType: da.signType,
+								paySign: da.paySign,
+								success: function(res) {
+									obj.paySuccessTo();
+								},
+								fail: () => {
+									uni.navigateTo({
+										url: '/pages/order/order?state=0'
+									});
+								}
+							};
+							// #ifdef H5
+							if (obj.payName == 'weixin') {
+								weichatObj.chooseWXPay(data);
+							}
+							// #endif
+							// #ifdef MP-WEIXIN
+							if (obj.payName == 'weixin' || obj.payName == 'routine') {
+								console.log('开始支付');
+								wx.requestPayment(data);
+							}
+							// #endif
 						}
-						// #endif
-					}
-					uni.hideLoading();
-					obj.payLoding = false;
-				})
-				.catch(e => {
-					// 支付完成
-					uni.hideLoading();
-					obj.payLoding = false;
-					console.log(e);
+						uni.hideLoading();
+						obj.payLoding = false;
+					})
+					.catch(e => {
+						// 支付完成
+						uni.hideLoading();
+						obj.payLoding = false;
+						console.log(e);
+					});
+			},
+			// 支付成功跳转
+			paySuccessTo() {
+				let obj = this;
+				uni.hideLoading();
+				uni.redirectTo({
+					url: '/pages/money/paySuccess?orderid=' + this.orderId
 				});
-		},
-		// 支付成功跳转
-		paySuccessTo() {
-			let obj = this;
-			uni.hideLoading();
-			uni.redirectTo({
-				url: '/pages/money/paySuccess?orderid=' + this.orderId
-			});
-		},
-		//确认支付
-		confirm: async function() {
-			let obj = this;
-			// 判断是否余额不足
-			if (obj.payName == 'yue' && +obj.now_money < obj.money) {
-				uni.showModal({
-					title: '提示',
-					content: '账户余额不足！',
-					showCancel: false,
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
+			},
+			//确认支付
+			confirm: async function() {
+				let obj = this;
+				// 判断是否余额不足
+				if (obj.payName == 'yue' && +obj.now_money < obj.money) {
+					uni.showModal({
+						title: '提示',
+						content: '账户消费金不足！',
+						showCancel: false,
+						success: res => {},
+						fail: () => {},
+						complete: () => {}
+					});
+					return;
+				}
+				uni.showLoading({
+					title: '支付中',
+					mask: true
 				});
-				return;
-			}
-			uni.showLoading({
-				title: '支付中',
-				mask: true
-			});
 
-			// 支付中
-			obj.payLoding = true;
-			// #ifdef H5
-			// 获取当前是否为微信浏览器
-			obj.froms = uni.getStorageSync('weichatBrowser') || '';
-			// #endif
-			// 判断是否为未支付订单中跳转进入
-			if (obj.type != 1) {
-				// 初次生成订单
-				obj.firstCreateOrder();
-			} else {
-				// 已经生成订单未支付
-				obj.orderMoneyPay();
-			}
-		},
-		// 初次订单创建
-		firstCreateOrder() {
-			let obj = this;
-			// 获取下单页面数据
-			let prepage = obj.$api.prePage();
-
-			let data = {
-				real_name: prepage.addressData.real_name, //联系人名称
-				phone: prepage.addressData.phone, //联系人号码
-				couponId: prepage.couponChecked.id, //优惠券编号
-				addressId: prepage.addressData.id, //支付地址id
-				useIntegral: prepage.checkedPoints ? 1 : 0, //是否积分抵扣1为是0为否
-				payType: obj.payName, //支付类型  weixin-微信 yue-余额
-				mark: prepage.desc, //备注
+				// 支付中
+				obj.payLoding = true;
 				// #ifdef H5
-				from: obj.froms ? 'weixin' : 'H5', //来源
-				// #endif
-				// #ifdef MP-WEIXIN
-				from: 'routine', //来源
-				// #endif
-				// #ifdef APP-PLUS
-				from: 'app', //来源
+				// 获取当前是否为微信浏览器
+				obj.froms = uni.getStorageSync('weichatBrowser') || '';
 				// #endif
-				shipping_type: 1 //提货方式 1 快递 2自提
-			};
-			// 判断是否拼团商品
-			if (obj.pinkid) {
-				data.pinkId = obj.pinkid;
-			}
-			// 生成订单
-			createOrderkey(data, obj.orderKey)
-				.then(({ data, status, msg }) => {
-					console.log('生成订单');
-					// 判断是否支付失败
-					if (data.status == 'ORDER_EXIST') {
+				// 判断是否为未支付订单中跳转进入
+				if (obj.type != 1) {
+					// 初次生成订单
+					obj.firstCreateOrder();
+				} else {
+					// 已经生成订单未支付
+					obj.orderMoneyPay();
+				}
+			},
+			// 初次订单创建
+			firstCreateOrder() {
+				let obj = this;
+				// 获取下单页面数据
+				let prepage = obj.$api.prePage();
+
+				let data = {
+					real_name: prepage.addressData.real_name, //联系人名称
+					phone: prepage.addressData.phone, //联系人号码
+					couponId: prepage.couponChecked.id, //优惠券编号
+					addressId: prepage.addressData.id, //支付地址id
+					useIntegral: prepage.checkedPoints ? 1 : 0, //是否积分抵扣1为是0为否
+					payType: obj.payName, //支付类型  weixin-微信 yue-余额
+					mark: prepage.desc, //备注
+					// #ifdef H5
+					from: obj.froms ? 'weixin' : 'H5', //来源
+					// #endif
+					// #ifdef MP-WEIXIN
+					from: 'routine', //来源
+					// #endif
+					// #ifdef APP-PLUS
+					from: 'app', //来源
+					// #endif
+					shipping_type: 1 //提货方式 1 快递 2自提
+				};
+				// 判断是否拼团商品
+				if (obj.pinkid) {
+					data.pinkId = obj.pinkid;
+				}
+				// 生成订单
+				createOrderkey(data, obj.orderKey)
+					.then(({
+						data,
+						status,
+						msg
+					}) => {
+						console.log('生成订单');
+						// 判断是否支付失败
+						if (data.status == 'ORDER_EXIST') {
+							uni.showModal({
+								title: '提示',
+								content: msg,
+								showCancel: false
+							});
+							uni.hideLoading();
+							obj.payLoding = false;
+							return;
+						}
+						// 保存订单号
+						obj.orderId = data.result.orderId;
+						// 判断是否为余额支付
+						if (obj.payName == 'yue' || obj.payName == 'offline') {
+							if (status == 200 && data.status == 'SUCCESS') {
+								obj.paySuccessTo();
+							} else {
+								obj.$api.msg(msg);
+							}
+						} else {
+							// 立即支付
+							obj.orderMoneyPay();
+						}
+					})
+					.catch(e => {
+						uni.hideLoading();
+						obj.payLoding = false;
+						console.log(e);
+						// uni.showToast({
+						// 	title: e.msg,
+						// 	duration: 4000,
+						// 	mask: false,
+						// 	icon: none
+						// });
 						uni.showModal({
 							title: '提示',
-							content: msg,
-							showCancel: false
+							content: e.msg
 						});
-						uni.hideLoading();
-						obj.payLoding = false;
-						return;
-					}
-					// 保存订单号
-					obj.orderId = data.result.orderId;
-					// 判断是否为余额支付
-					if (obj.payName == 'yue') {
-						if (status == 200 && data.status == 'SUCCESS') {
-							obj.paySuccessTo();
-						} else {
-							obj.$api.msg(msg);
-						}
-					} else {
-						// 立即支付
-						obj.orderMoneyPay();
-					}
-				})
-				.catch(e => {
-					uni.hideLoading();
-					obj.payLoding = false;
-					console.log(e);
-					// uni.showToast({
-					// 	title: e.msg,
-					// 	duration: 4000,
-					// 	mask: false,
-					// 	icon: none
-					// });
-					uni.showModal({
-						title: '提示',
-						content: e.msg
 					});
-				});
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-.app {
-	width: 100%;
-}
-
-.price-box {
-	background-color: #fff;
-	height: 265upx;
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	align-items: center;
-	font-size: 28upx;
-	color: #909399;
-
-	.price {
-		font-size: 50upx;
-		color: #303133;
-		margin-top: 12upx;
-		&:before {
-			content: '￥';
-			font-size: 40upx;
-		}
+	.app {
+		width: 100%;
 	}
-}
 
-.pay-type-list {
-	margin-top: 20upx;
-	background-color: #fff;
-	padding-left: 60upx;
-	.type-item {
-		height: 120upx;
-		padding: 20upx 0;
+	.price-box {
+		background-color: #fff;
+		height: 265upx;
 		display: flex;
-		justify-content: space-between;
+		flex-direction: column;
+		justify-content: center;
 		align-items: center;
-		padding-right: 60upx;
-		font-size: 30upx;
-		position: relative;
-	}
+		font-size: 28upx;
+		color: #909399;
 
-	.icon {
-		width: 100upx;
-		font-size: 52upx;
-	}
-	.iconyue {
-		color: #fe8e2e;
-	}
-	.iconweixin {
-		color: #36cb59;
-	}
-	.iconzhifubao {
-		color: #01aaef;
+		.price {
+			font-size: 50upx;
+			color: #303133;
+			margin-top: 12upx;
+
+			&:before {
+				content: '￥';
+				font-size: 40upx;
+			}
+		}
 	}
-	.tit {
-		font-size: $font-lg;
-		color: $font-color-dark;
-		margin-bottom: 4upx;
+
+	.pay-type-list {
+		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;
+		}
+
+		.pay-icon {
+			width: 52rpx;
+			height: 52rpx;
+			display: inline-block;
+			margin-right: 50rpx;
+		}
+
+		.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;
+		}
 	}
-	.con {
-		flex: 1;
+
+	.mix-btn {
 		display: flex;
-		flex-direction: column;
-		font-size: $font-sm;
-		color: $font-color-light;
+		align-items: center;
+		justify-content: center;
+		width: 630upx;
+		height: 80upx;
+		margin: 80upx auto 30upx;
+		font-size: $font-lg;
+		color: #fff;
+		background-color: $base-color;
+		border-radius: 10upx;
+		/* box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4); */
 	}
-}
-.mix-btn {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	width: 630upx;
-	height: 80upx;
-	margin: 80upx auto 30upx;
-	font-size: $font-lg;
-	color: #fff;
-	background-color: $base-color;
-	border-radius: 10upx;
-	/* box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4); */
-}
 
-.clickbg {
-	background-color: $color-gray !important;
-}
-</style>
+	.clickbg {
+		background-color: $color-gray !important;
+	}
+</style>

pages/money/paySuccess.vue

@@ -76,12 +76,13 @@
 	}
 
 	.mix-btn2 {
+		margin-left: 20rpx;
 		display: flex;
 		align-items: center;
 		justify-content: center;
 		width: 300rpx;
 		height: 78rpx;
-		background: #FF4C4C;
+		background: #FE7C1C;
 		border-radius: 10rpx;
 		font-size: 30rpx;
 		font-family: PingFang SC;

pages/money/wallet.vue

@@ -9,9 +9,9 @@
 			</view>
 		</view>
 		<view class="row-box">
-			<view class="title">收款人手机号</view>
-			<view class="row"><input class="input" type="number" v-model="card" placeholder="请输入收款人手机号"
-					placeholder-class="placeholder" /></view>
+			<view class="title" style="color: #ee6c04;">正在给{{name}}转账</view>
+			<!-- <view class="row"><input class="input" type="number" v-model="card" placeholder="请输入收款人账号" :disabled="true"
+					placeholder-class="placeholder" /></view> -->
 		</view>
 		<!-- <view class="row-box">
 			<view class="title">交易密码</view>
@@ -58,15 +58,16 @@
 				weichatBsrowser: false,
 				// #endif
 				loding: false,
-				type: ''
 			};
 		},
 		onLoad(options) {
 			// #ifdef H5
 			this.weichatBsrowser = uni.getStorageSync('weichatBrowser');
 			// #endif
-			this.type = options.type;
+			this.card = options.id;
+			this.name = options.nickname;
 			this.dataUp();
+
 		},
 		computed: {
 			...mapState('user', ['userInfo'])
@@ -223,7 +224,7 @@
 		margin: 140rpx auto;
 		font-family: PingFang SC;
 		font-weight: bold;
-		background: linear-gradient(90deg, #CA57DC, #65B2E9);
+		background: #fd7811;
 		color: #fff;
 		line-height: 90rpx;
 	}

pages/product/product.vue

@@ -33,8 +33,8 @@
 				<text class="price-tip">¥</text>
 				<text class="price">{{ goodsObjact.price}}</text>
 				<text class="m-price" v-if="goodsObjact.ot_price > goodsObjact.price">¥{{ goodsObjact.ot_price }}</text>
-				<text class="give-jf">
-					赠{{goodsObjact.give_award_range*1}}消费金
+				<text class="give-jf" v-if="goodsObjact.give_money*1 != 0">
+					赠{{goodsObjact.give_money*1}}消费金
 				</text>
 			</view>
 			<text class="title" v-if="goodsType == 0">{{ goodsObjact.store_name }}</text>
@@ -47,15 +47,9 @@
 				</view>
 				<text class="iconfont iconenter"></text>
 			</view>
-			<view class="c-row b-b" @click="toggleSpec">
-				<text class="tit">购买数量</text>
-				<view class="con">
-					<text class="selected-text">{{ goodsNumber }}</text>
-				</view>
-				<text class="iconfont iconenter"></text>
-			</view>
-			<view class="c-row b-b" v-if="goodsObjact.give_integral != 0">
-				<text class="tit" style="width: 100%;">每购买一个送{{ goodsObjact.give_integral }}积分</text>
+			<view class="c-row b-b" v-if="goodsObjact.give_level != 0">
+				<text class="tit" style="width: 100%;">购买商品赠送 <text style="color:#fd7811;">{{ level.name }} </text>
+				</text>
 			</view>
 			<!-- <view class="c-row b-b" v-if="goodsObjact.is_integral == 1 && goodsType == 0">
 				<text class="tit">积分</text>
@@ -81,7 +75,7 @@
 				</view>
 				<view class="buy-now">
 					<button type="primary" class=" action-btn no-border buy-now-btn" @click.stop="toggleSpec(2)"
-						v-if="is_bk == 0 && is_xf ==0">加入购物车</button>
+						v-if="isvip != 1">加入购物车</button>
 					<button type="primary" class=" action-btn no-border  add-cart-btn"
 						@click.stop="toggleSpec(1)">立即购买</button>
 				</view>
@@ -173,6 +167,7 @@
 		},
 		data() {
 			return {
+				level: '',
 				details: '',
 				reply: '', //评论
 				type: 1, //默认支付方式add为
@@ -222,18 +217,14 @@
 					i: '', //分
 					s: '' //秒
 				},
-				is_bk: 0,
-				is_xf: 0,
+				isvip: 0,
 				goodIntegral: 0, //需要使用的积分
 			};
 		},
 		async onLoad(options) {
 			let obj = this;
-			if (options.is_bk) {
-				obj.is_bk = options.is_bk
-			}
-			if (options.is_xf) {
-				obj.is_xf = options.is_xf
+			if (options.isvip) {
+				obj.isvip = options.isvip
 			}
 			//保存商品id
 			this.goodsid = options.id;
@@ -338,7 +329,11 @@
 					let store_info = data.system_store; // 保存店铺信息
 					console.log(store_info);
 					obj.storeObjact = store_info;
+					obj.level = data.give_level_info;
 					obj.goodsObjact = goods;
+					if (obj.level) {
+						obj.isvip = 1
+					}
 					if (obj.goodsObjact.description != null) {
 						obj.goodsObjact.description = obj.goodsObjact.description.replace(/\<img/gi,
 							'<img class="rich-img"');
@@ -365,7 +360,7 @@
 					}
 
 					//保存默认选中的对象字符串名称
-					let str = obj.specSelected.join(',');
+					let str = obj.specSelected.reverse().join(',');
 					// 设置默认值
 					obj.actionImage = obj.productValue[str].image;
 					obj.uniqueId = obj.productValue[str].unique;
@@ -525,7 +520,7 @@
 							// 跳转到支付页
 							uni.navigateTo({
 								url: '/pages/order/createOrder?id=' + data.cartId + '&goodsType=' + obj
-									.goodsType + '&is_xf=' + obj.is_xf + '&is_bk=' + obj.is_bk
+									.goodsType + '&isvip=' + obj.isvip
 							});
 						}
 						if (obj.type == 2) {

pages/public/forget.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="container">
 		<view class="title-img">
-			<image class="title-image" src="../../static/img/hlogo.png" mode="widthFix"></image>
+			<!-- <image class="title-image" src="../../static/img/hlogo.png" mode="widthFix"></image> -->
 		</view>
 		<view class="title-font">
-			挺酒商城
+			芊扦龙虾
 		</view>
 		<view class="login_text">
 			<view class="login_input flex_item">

pages/public/login.vue

@@ -3,7 +3,7 @@
 		<view class="container_text">
 			<image class="banner-img" src="../../static/img/login-title.png" mode="widthFix"></image>
 			<view class="title-img">
-				<image class="title-image" src="../../static/img/logo.png" mode="widthFix"></image>
+				<!-- <image class="title-image" src="../../static/img/logo.png" mode="widthFix"></image> -->
 			</view>
 		</view>
 		<view class="login_text">

pages/public/register.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="container">
 		<view class="title-img">
-			<image class="title-image" src="../../static/img/hlogo.png" mode="widthFix"></image>
+			<!-- <image class="title-image" src="../../static/img/hlogo.png" mode="widthFix"></image> -->
 		</view>
 		<view class="title-font">
-			挺酒商城
+			芊扦龙虾
 		</view>
 		<view class="login_text">
 			<view class="login_input flex">

pages/public/wxLogin.vue

@@ -3,306 +3,208 @@
 		<!-- #ifndef H5 -->
 		<!-- <image class="bg-img" :src="baseURL+urlFile+'/img/img09.png'" mode=" scaleToFill"></image> -->
 		<view class="logo-img-box">
-			<image class="logo-img" src="../../static/img/logo.png" mode=" aspectFit"></image>
-			<!-- 获取头像登录 -->
-			<!-- <button class="userInfo" type="warn" @click="isclick?'':userInfoData()" :class="{'nocaction': isclick}">
+			<image class="logo-img" src="https://hongmd.liuniu946.com/static/img/hmdlogo.png" mode=" aspectFit"></image>
+			<button class="userInfo" type="warn" @click="isclick?'':userInfoData()" :class="{'nocaction': isclick}">
 				<text class="iconfont iconweixin"></text>
 				<text>
-				微信授权登录
+					微信授权登录
 				</text>
-			</button> -->
-			<!-- 获取手机号登录 -->
-			<template v-if="!hasphone">
-				<button class="userInfo" type="warn" :class="{ nocaction: isclick }" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
-					<text class="iconfont iconweixin"></text>
-					<text>微信授权登录</text>
-				</button>
-			</template>
-			<template v-if="hasphone">
-				<button class="userInfo" type="warn" :class="{ nocaction: isclick }" @click="isclick ? '' : userInfoData()">
-					<text class="iconfont iconweixin"></text>
-					<text>微信授权登录</text>
-				</button>
-			</template>
-
-			<!-- 550*450 -->
-			<uni-popup ref="popupsq" type="center">
-				<view class="popupsq-wrap">
-					<view class="" style="text-align: center;font-size: 32rpx;font-weight: bold;padding: 40rpx 0;color: #000;">华景美业</view>
-					<view class="" style="font-size: 26rpx;padding-bottom: 35rpx;color: #000;">该程序获取以下授权:</view>
-					<view class="" style="font-size: 26rpx;color:#b7b7b7;">获取您的公开信息（昵称，头像），以便于个性话头像和昵称</view>
-					<view class="flex" style="padding-top: 40rpx;">
-						<view class="btn qx" style="" @click="close()">取消</view>
-						<view class="btn qr" style="" @click="isclick ? '' : userInfoData()">确认授权</view>
-					</view>
-				</view>
-			</uni-popup>
+			</button>
 		</view>
 		<!-- #endif -->
 	</view>
 </template>
 
 <script>
-import { getUserInfo } from '@/api/login.js';
-// #ifdef H5
-import { loginWinxin } from '@/utils/wxAuthorized';
-// #endif
-// #ifdef MP-WEIXIN
-import { loginWinxinMp } from '@/utils/wxMinProgram';
-import { wechatMpAuth } from '@/api/wx';
-// #endif
-import { mapMutations, mapState } from 'vuex';
-export default {
-	data() {
-		return {
-			userInfo: {}, //授权用户信息
-			code: '', //授权code
-			isclick: false, //是否点击了
-			iv1: '',
-			encryptedData1: '',
-			hasphone: false
-		};
-	},
-	onLoad() {
-		this.loadData();
-	},
-	computed: {
-		// ...mapState(['baseURL','urlFile'])
-	},
-	methods: {
-		// ...mapMutations(['login', 'setUserInfo']),
-		...mapMutations('user', ['login', 'setUserInfo']),
-		close() {
-			this.$refs.popupsq.close();
+	import {
+		getUserInfo
+	} from '@/api/login.js';
+	// #ifdef H5
+	import {
+		loginWinxin
+	} from '@/utils/wxAuthorized';
+	// #endif
+	// #ifdef MP-WEIXIN
+	import {
+		loginWinxinMp
+	} from '@/utils/wxMinProgram';
+	import {
+		wechatMpAuth
+	} from '@/api/wx';
+	// #endif
+	import {
+		mapMutations,
+		mapState
+	} from 'vuex';
+	export default {
+		data() {
+			return {
+				userInfo: {}, //授权用户信息
+				code: '', //授权code
+				isclick: false, //是否点击了
+			};
 		},
-		getPhoneNumber(e) {
-			let obj = this;
-			console.log(e, 'e+++++++++++++++');
-			// 用户同意授权
-			if (e.detail.errMsg == 'getPhoneNumber:ok') {
-				console.log('chenggong++++++++++++++');
-				obj.hasphone = true;
-				obj.iv1 = e.detail.iv;
-				obj.encryptedData1 = e.detail.encryptedData;
-				obj.$refs.popupsq.open();
-			} else {
-				obj.isclick = false;
-				uni.showToast({
-					title: '您拒绝了请求,不能正常使用小程序',
-					icon: 'error',
-					duration: 2000
-				});
-				return;
-			}
+		onLoad(option) {
+			this.loadData();
 		},
-		loadData() {
-			let obj = this;
-			// #ifdef H5
-			loginWinxin();
-			// #endif
-			// #ifdef MP-WEIXIN
-			loginWinxinMp().then(e => {
-				console.log(e, 'ddddddddddddddddddddddd');
-				// obj.code = e.code
-				wx.login({
-					success(e) {
-						console.log(e, 'loginWinxinMp');
-						obj.code = e.code;
-						console.log(obj.code, 'wxlogin.code++++++');
+		computed: {
+			// ...mapState(['baseURL','urlFile']) 
+		},
+		methods: {
+			// ...mapMutations(['login', 'setUserInfo']),
+			...mapMutations('user', ['login', 'setUserInfo']),
+			loadData() {
+				let obj = this;
+				// #ifdef H5
+				loginWinxin();
+				// #endif
+				// #ifdef MP-WEIXIN
+				loginWinxinMp().then(() => {
+					wx.login({
+						success(e) {
+							console.log(e, 'loginWinxinMp');
+							obj.code = e.code;
+						},
+						fill: function(e) {
+							console.log(e)
+						}
+					})
+				});
+				// #endif
+			},
+			// 用户确认授权
+			userInfoData() {
+				let that = this
+				if (that.isclick) {
+					return
+				}
+				that.isclick = true
+				wx.getUserProfile({
+					desc: '用于完善会员资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
+					success: res => {
+						console.log(res, 'that.userInfo+++++++++++++++++++')
+						that.userInfo = res;
+						uni.showLoading({
+							title: '授权中',
+							mask: true
+						});
+						that.loadMp();
 					},
-					fill: function(e) {
-						console.log(e);
+					fail: err => {
+						that.isclick = false
+						uni.showToast({
+							title: '您拒绝了请求,不能正常使用小程序',
+							icon: 'error',
+							duration: 2000
+						});
+						return;
 					}
 				});
-			});
-			// #endif
-		},
-		// 用户确认授权
-		userInfoData() {
-			let that = this;
-			if (that.isclick) {
-				return;
-			}
-			that.isclick = true;
-			wx.getUserProfile({
-				desc: '用于完善会员资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
-				success: res => {
-					console.log(res, 'that.userInfo+++++++++++++++++++');
-					that.userInfo = res;
-					uni.showLoading({
-						title: '授权中',
-						mask: true
-					});
-					that.loadMp();
-				},
-				fail: err => {
-					that.isclick = false;
-					uni.showToast({
-						title: '您拒绝了请求,不能正常使用小程序',
-						icon: 'error',
-						duration: 2000
-					});
-					return;
-				}
-			});
-			// this.userInfo = e;
-			// console.log(e,'用户确认授权')
-			// this.loadMp()
-		},
-		// #ifdef MP-WEIXIN
-		loadMp() {
-			let obj = this;
-			// 获取登录授权页数据
-			let user = obj.userInfo;
-			console.log(user);
-			// 获取推广人id
-			let spread_spid = uni.getStorageSync('spread') || '';
-			// #ifdef MP
-			let spread_code = uni.getStorageSync('spread_code') || '';
-			// #endif
+				// this.userInfo = e;
+				// console.log(e,'用户确认授权')
+				// this.loadMp()
 
-			wechatMpAuth({
-				code: obj.code,
-				iv: user.iv,
-				iv1: obj.iv1,
-				encryptedData1: obj.encryptedData1,
-				encryptedData: user.encryptedData,
-				spread_spid: spread_spid,
+			},
+			// #ifdef MP-WEIXIN
+			loadMp() {
+				let obj = this;
+				// 获取登录授权页数据
+				let user = obj.userInfo;
+				console.log(user)
+				// 获取推广人id
+				let spread_spid = uni.getStorageSync('spread') || '';
 				// #ifdef MP
-				spread_code: spread_code
+				let spread_code = uni.getStorageSync('spread_code') || '';
 				// #endif
-			})
-				.then(({ data }) => {
+
+				wechatMpAuth({
+					code: obj.code,
+					iv: user.iv,
+					encryptedData: user.encryptedData,
+					spread_spid: spread_spid,
+					// #ifdef MP
+					spread_code: spread_code,
+					// #endif
+				}).then(({
+					data
+				}) => {
 					obj.wchatAuth(data);
-					console.log(data, 'wechatMpAuth++++++++++++++++++++++++++');
-				})
-				.catch(err => {
+					console.log(data, 'wechatMpAuth++++++++++++++++++++++++++')
+
+				}).catch(err => {
 					// obj.loding = false;
 					// uni.hideLoading();
 				});
-		},
-		// #endif
-		wchatAuth(data) {
-			let obj = this;
-			// 保存token
-			uni.setStorageSync('token', data.token);
-			console.log(data.token, 'token++++++++++++++');
-			// 获取用户基础信息
-			getUserInfo({}).then(e => {
-				console.log('userInfo+++++++++++', e);
-				obj.login();
-				uni.hideLoading();
-				// 保存返回用户数据
-				obj.setUserInfo(e.data);
-				if (e.data.nickname == '微信用户') {
-					uni.showModal({
-						title: '提示',
-						content: '您暂未设置用户名，头像。是否前往设置',
-						success: function(res) {
-							if (res.confirm) {
-								uni.navigateTo({
-									url: '/pages/set/userinfo'
-								});
-							} else if (res.cancel) {
-								logout({})
-									.then(e => {
-										obj.logout();
-									})
-									.catch(e => {
-										console.log(e);
-									});
-								obj.go();
-							}
-						}
-					});
-				} else {
-					obj.go();
-				}
-			});
-		},
-		go() {
-			// 保存返回用户数据
-			let ur = uni.getStorageSync('present') || '/pages/index/index';
-			// 用于处理缓存bug
-			if (ur == 'pages/shop/product') {
-				ur = '/pages/index/index';
-			}
-			uni.switchTab({
-				url: ur,
-				fail(e) {
-					uni.navigateTo({
+			},
+			// #endif
+			wchatAuth(data) {
+				let obj = this;
+				// 保存token
+				uni.setStorageSync('token', data.token);
+				console.log(data.token, 'token++++++++++++++')
+				// 获取用户基础信息
+				getUserInfo({}).then(e => {
+					console.log('userInfo+++++++++++', e)
+					obj.login();
+					uni.hideLoading();
+					// 保存返回用户数据
+					obj.setUserInfo(e.data);
+					let ur = uni.getStorageSync('present') || '/pages/index/index';
+					// 用于处理缓存bug
+					if (ur == 'pages/shop/product') {
+						ur = '/pages/index/index'
+					}
+					uni.switchTab({
 						url: ur,
 						fail(e) {
 							uni.navigateTo({
-								url: '/pages/index/index'
+								url: ur,
+								fail(e) {
+									uni.navigateTo({
+										url: '/pages/index/index',
+									});
+								}
 							});
 						}
 					});
-				}
-			});
+				});
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-page,
-.content {
-	height: 100%;
-	background-color: #fff;
-}
-
-.bg-img,
-.logo-img-box {
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-}
-
-.logo-img {
-	margin-top: 20vh;
-	margin-left: 176rpx;
-	width: 385rpx;
-	height: 394rpx;
-}
-
-.userInfo {
-	margin: 0 100rpx;
-	margin-top: 50rpx;
-	color: #ffffff;
-	border-radius: 99rpx;
-	background-color: $base-color !important;
-}
-
-.nocaction {
-	background-color: #999;
-}
+	page,
+	.content {
+		height: 100%;
+		background-color: #fff;
+	}
 
-.popupsq-wrap {
-	width: 550rpx;
-	height: 450rpx;
-	background-color: #fff;
-	border-radius: 20rpx;
-	padding: 0 30rpx;
+	.bg-img,
+	.logo-img-box {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+	}
 
-	.btn {
-		width: 240rpx;
-		height: 90rpx;
-		text-align: center;
-		line-height: 90rpx;
-		font-size: 30rpx;
-		border-radius: 45rpx;
-		font-weight: bold;
+	.logo-img {
+		margin-top: 20vh;
+		margin-left: 176rpx;
+		width: 385rpx;
+		height: 394rpx;
 	}
-	.qx {
-		color: #000;
-		border: #f0f0f0 1px solid;
+
+	.userInfo {
+		margin: 0 100rpx;
+		margin-top: 50rpx;
+		color: #FFFFFF;
+		border-radius: 99rpx;
+		background-color: $base-color !important;
 	}
-	.qr {
-		color: #fff;
-		background-color: $base-color;
+
+	.nocaction {
+		background-color: #999;
 	}
-}
-</style>
+</style>

pages/set/address.vue

@@ -229,7 +229,7 @@
 		height: 80rpx;
 		font-size: $font-lg;
 		color: #fff;
-		background: linear-gradient(90deg, #CA57DC, #65B2E9);
+		background: #fd7811;
 		border-radius: 10rpx;
 	}
 </style>

pages/set/userinfo.vue

@@ -224,7 +224,7 @@
 		margin: 80rpx auto 0;
 		font-family: PingFang SC;
 		font-weight: bold;
-		background: linear-gradient(90deg, #CA57DC, #65B2E9);
+		background: #fd7811;
 		color: #fff;
 	}
 
@@ -237,8 +237,9 @@
 		margin: 140rpx auto 0;
 		font-family: PingFang SC;
 		font-weight: bold;
-		background: linear-gradient(90deg, #65B2E9, #CA57DC);
-		color: #fff;
+		border: 1px solid #fd7811;
+		background: #ffffff;
+		color: #fd7811;
 	}
 
 	.out {

pages/user/award.vue

@@ -31,7 +31,7 @@
 				</view> -->
 			</view>
 		</view>
-		<view class="info-box flex">
+		<!-- <view class="info-box flex">
 			<view class="info-item">
 				<view class="info-font">累计收入</view>
 				<view class="info-num">{{ recharge || '0' }}</view>
@@ -41,7 +41,7 @@
 				<view class="info-font">累计支出</view>
 				<view class="info-num">{{ orderStatusSum || '0' }}</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>
@@ -58,7 +58,7 @@
 						<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
 							<view class="title-box">
 								<view class="title">
-									<text>{{ item.mark }}</text>
+									<text>{{ item.title }}</text>
 								</view>
 								<view class="time">
 									<text>{{ item.add_time }}</text>
@@ -92,7 +92,7 @@
 	import empty from '@/components/empty';
 	import {
 		extractBank,
-		integral
+		spreadCommission
 	} from '@/api/wallet.js';
 	export default {
 		filters: {
@@ -177,7 +177,7 @@
 				//这里时将订单挂载到tab列表下
 				let index = this.tabCurrentIndex;
 				let navItem = this.navList[index];
-				let state = navItem.state;
+				let state = navItem.state + 3;
 				if (source === 'tabChange' && navItem.loaded === true) {
 					//tab切换只有第一次需要加载数据
 					return;
@@ -189,19 +189,19 @@
 				//修改当前对象状态为加载中
 				navItem.loadingType = 'loading';
 
-				integral({
+				spreadCommission({
 						page: navItem.page,
 						limit: navItem.limit,
-						category: 'brokerage',
-						pm: state
-					})
+					}, state)
 					.then(({
 						data
 					}) => {
 						if (data.length > 0) {
-							navItem.orderList = navItem.orderList.concat(data);
-							navItem.page++;
+							data.forEach(e => {
+								navItem.orderList = navItem.orderList.concat(e.list);
+							})
 						}
+						navItem.page++;
 						//判断是否还有数据, 有改为more, 没有改为noMore
 						if (navItem.limit == data.length) {
 							navItem.loadingType = 'more';

pages/user/shareQrCode.vue

@@ -1,105 +1,106 @@
 <template>
-	<view class="main">
-		<view class="qrimg">
-			<tki-qrcode :cid="cid" ref="qrcode" :val="val" :size="size" :unit="unit" :background="background"
-				:foreground="foreground" :pdground="pdground" :icon="icon" :iconSize="iconSize" :lv="lv" :onval="onval"
-				:showLoading="showLoading" :loadMake="loadMake" :usingComponents="usingComponents" @result="qrR" />
-		</view>
-		<!-- 		<view class="qrcode-wrapper">
-			<image class="qrcode-save__image" :src="shareQrcodeUrl" mode="aspectFit"></image>
-			<view class="qrcode-save__btn">
-				
-			</view>
-		</view> -->
-		<!-- <canvas :style="{ width: canvasW + 'px', height: canvasH + 'px',}" canvas-id="myCanvas" id="myCanvas"></canvas> -->
-		<canvas :style="{ width:  '600rpx', height: '1066rpx',}" canvas-id="myCanvas" id="myCanvas" class="hb"></canvas>
-		<!-- <view class="" v-if="fina">
-			<button text="保存图片" @click="saveShareQrcode">保存图片</button>
+	<view class="andr-shQ-padL30 andr-shQ-padR30 andr-shQ-Flex andr-shQ-FlexDirC">
+		<view class="andr-shQ-w100B andr-shQ-Flex andr-shQ-JusCC">
+			<swiper class="imgw750h375 matop" :indicator-dots="false" :current="current" @change="currentChange">
+				<!-- #ifdef H5 -->
+				<swiper-item v-for="(item, index) in rwmListArr" :key="index">
+					<image :src="item.wap_poster" mode="aspectFit" class="imgw750h375" />
+				</swiper-item>
+				<!-- #endif -->
+				<!-- #ifdef MP-WEIXIN -->
+				<swiper-item v-for="(item, index) in rwmListArr" :key="index">
+					<image :src="item.poster" mode="aspectFit" class="imgw750h375" />
+				</swiper-item>
+				<!-- #endif -->
+
+			</swiper>
 		</view>
-		<view class="" v-if="fina">
-			<button text="保存图片" @click="saveShareQrcode">分享链接</button>
-		</view> -->
-		<!-- <view class="btm-btn" v-if="fina">
-			<view class="btn" @click="comfirm">
-				<image src="../../static/icon/fzlj.png" mode=""></image>
-				<view class="">
-					复制邀请链接
-				</view>
-			</view>
-			<view class="btn" @click="saveShareQrcode">
-				<image src="../../static/icon/fxhb.png" mode=""></image>
-				<view class="">
-					保存分享海报
-				</view>
-			</view>
-		</view> -->
+		<!-- <view class="baocun" @click="comfirm(userInfo.uid+'')">复制邀请码</view> -->
+		<!-- #ifdef H5 -->
+		<!-- <view class="baocun">长按二维码保存图片</view> -->
+
+		<!-- #endif -->
+		<!-- #ifdef MP-WEIXIN -->
+		<view class="baocun" @click="seav">保存分享海报</view>
+		<!-- <button open-type="share" class="baocun btn" v-if="scLoading == 2">分享到微信</button> -->
+		<!-- #endif -->
 	</view>
 </template>
-
 <script>
 	import {
-		mapState,
-		mapMutations
+		mapState
 	} from 'vuex';
 	import {
-		getUserInfo
+		spreadBanner
 	} from '@/api/user.js';
-
-	var that
+	import {
+		interceptor,
+		saveUrl
+	} from '@/utils/loginUtils';
+	// #ifdef H5
+	import {
+		weixindata
+	} from '@/utils/wxAuthorized';
+	// #endif
 	export default {
 		data() {
 			return {
-				cid: 'tki-qrcode-canvas', //canvasId，页面存在多个二维码组件时需设置不同的ID
-				size: 300, //生成的二维码大小
-				unit: 'upx', //大小单位尺寸
-				// show: true,//默认使用组件中的image标签显示二维码
-				val: '', //要生成的内容
-				background: '#ffffff', //二维码背景色
-				foreground: '#333333', //二维码前景色
-				pdground: '#333333', //二维码角标色
-				icon: '', //二维码图标URL（必须是本地图片，网络图需要先下载至本地）
-				iconSize: 40, //二维码图标大小
-				lv: 3, //容错级别
-				onval: true, //监听val值变化自动重新生成二维码
-				loadMake: true, //组件初始化完成后自动生成二维码，val需要有值
-				usingComponents: false, //是否使用了自定义组件模式（主要是为了修复非自定义组件模式时 v-if 无法生成二维码的问题）
-				showLoading: false, //是否显示loading
-
-				erweimasrc: '',
-				canvasW: 0, // 画布宽
-				canvasH: 0, // 画布高
-				SystemInfo: {}, // 设备信息
-				goodsImg: {}, // 商品主图
-				ewmImg: {}, // 二维码图片
-				ewmW: 0, // 二维码大小
-				title: '', // 商品标题
-				canvasShow: true,
-				shareQrcodeUrl: '', //canvas本地路径
-				ratio: '', //画布比例
-				fina: false,
+				rwmListArr: [],
+				current: 0,
+				imgSrc: ''
+			};
+		},
+		onLoad(option) {
+			uni.showLoading({
+				title: '邀请图生成中',
+				mask: true
+			});
+			// 判断是否强制登录
+			this.loadCodeList();
+			// #ifdef MP-WEIXIN
+			uni.authorize({
+				scope: 'scope.writePhotosAlbum',
+				complete() {}
+			});
+			// #endif
+		},
+		onShow() {
+			if (this.loginInterceptor && !this.hasLogin) {
+				saveUrl();
+				// 登录拦截
+				interceptor();
 			}
 		},
+		//下拉刷新
+		onPullDownRefresh() {
+			let obj = this;
+			//监听下拉刷新动作的执行方法，每次手动下拉刷新都会执行一次
+			setTimeout(function() {
+				obj.loadCodeList();
+				uni.stopPullDownRefresh(); //停止下拉刷新动画
+			}, 1000);
+		},
 		computed: {
-			...mapState(['baseURL', 'urlFile']),
+			...mapState(['weichatObj', 'baseURL', 'urlFile']),
 			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
 		},
-		onLoad(options) {
-			const obj = this;
-			if (!this.userInfo.uid) {
-				getUserInfo({}).then(e => {
-					// 保存返回用户数据
-					obj.setUserInfo(e.data);
-					//成功跳转首页
-					uni.switchTab({
-						url: '/pages/index/index'
-					});
-				});
-			} else {
-				this.val = 'http://www.tingjiu.liuniukj.com/index/#/pages/public/register?spread=' + this.userInfo
-					.phone
-			}
-		},
 		methods: {
+			comfirm(text) {
+				// let text = this.userInfo.uid
+				console.log(text);
+				const result = this.uniCopy(text);
+				if (result === false) {
+					uni.showToast({
+						title: '不支持'
+					});
+				} else {
+					uni.showToast({
+						title: '复制成功',
+						icon: 'none'
+					});
+				}
+				// this.$refs.popup.close();
+			},
 			uniCopy(content) {
 				/**
 				 * 小程序端 和 app端的复制逻辑
@@ -134,261 +135,212 @@
 				return result;
 				// #endif
 			},
-			comfirm() {
-				const result = this.uniCopy(this.val);
-				if (result === false) {
-					uni.showToast({
-						title: '不支持'
-					});
-				} else {
-					uni.showToast({
-						title: '复制成功',
-						icon: 'none'
-					});
-				}
+			loadCodeList() {
+				let self = this;
+				// 加载二维码信息
+				// let andrUid = uni.getStorageSync('andrUid')||'';
+				spreadBanner({
+					// #ifdef H5
+					type: 2,
+					// #endif
+					// #ifdef MP
+					type: 1,
+					// #endif
+				}).then(e => {
+					if (e.status == 200) {
+						console.log(e.data)
+						self.rwmListArr = e.data;
+						// #ifdef H5
+						self.imgSrc = self.rwmListArr[0].wap_poster;
+						// #endif
+						// #ifdef MP-WEIXIN
+						self.imgSrc = self.rwmListArr[0].poster;
+						// #endif
+					}
+					uni.hideLoading();
+				});
 			},
-			qrR(res) {
-				this.erweimasrc = res
-				console.log(res, 'erweima');
-				this.createPoster()
+			currentChange(e) {
+				this.current = e.detail.current;
 			},
-			async createPoster() {
-				let that = this
-				// 获取设备信息，主要获取宽度，赋值给canvasW 也就是宽度：100%
-				this.SystemInfo = await this.getSystemInfo();
-				// 获取商品主图，二维码信息，APP端会返回图片的本地路径（H5端只能返回原路径）
-				this.goodsImg = await this.getImageInfo('/static/img/sharebase.jpg');
-				this.ewmImg = await this.getImageInfo(this.erweimasrc);
-				// this.canvasW = this.SystemInfo.windowWidth; // 画布宽度
-				this.ratio = this.SystemInfo.windowWidth / 750;
-				this.canvasW = 600 * this.ratio;
-				this.canvasH = 1066 * this.ratio;
-				this.ewmW = 150 * this.ratio;
-				this.ewmBg = 180 * this.ratio;
-				console.log(this.canvasH, 'this.canvasH')
-				// this.canvasH = this.goodsImg.height + this.ewmW + 200;  // 画布高度 = 主图高度+二维码高度 + 文字图片的间距（大概50）
+			// onShareAppMessage(options){
+			// 	console.log(options,'options')
+			// 	let userInfo = uni.getStorageSync('userInfo');
+			// 	console.log(userInfo)
+			// 　　let obj = this;
+			// 　　// 设置菜单中的转发按钮触发转发事件时的转发内容
+			// 　　let shareObj = {
+			// 　　　　title: "邀请好友领券",        // 默认是小程序的名称(可以写slogan等)
+			// 　　　　path: '/pages/index/index?spread='+userInfo.uid,        // 默认是当前页面，必须是以‘/’开头的完整路径
+			// 　　　　imageUrl: obj.imgSrc,
+			// 　　　　success: function(res){
+			// 　　　　　　// 转发成功之后的回调
+			// 　　　　　　if(res.errMsg == 'shareAppMessage:ok'){
+			// 　　　　　　}
+			// 　　　　},
+			// 　　　　fail: function(){
+			// 　　　　　　// 转发失败之后的回调
+			// 　　　　　　if(res.errMsg == 'shareAppMessage:fail cancel'){
+			// 　　　　　　　　// 用户取消转发
+			// 　　　　　　}else if(res.errMsg == 'shareAppMessage:fail'){
+			// 　　　　　　　　// 转发失败，其中 detail message 为详细失败信息
+			// 　　　　　　}
+			// 　　　　}
+			// 　　};
+			// 　　// 来自页面内的按钮的转发
+			// 　　if( options.from == 'button' ){
+			// 　　　　// 此处可以修改 shareObj 中的内容
+			// 　　　　shareObj.path = '/pages/index/index?spread='+userInfo.uid;
+			//         console.log(shareObj.path,'shareObj.path')
+			// 　　}
+			// 　　// 返回shareObj
+			// 　　return shareObj;
+			// },
+			// scClick() {
+			// 	let self = this;
+			// 	// #ifdef H5
+			// 	self.imgSrc = self.rwmListArr[self.current].wap_poster;
+			// 	// #endif
+			// 	// #ifdef MP-WEIXIN
+			// 	self.imgSrc = self.rwmListArr[self.current].poster;
+			// 	// #endif
+			// },
+			// #ifdef MP-WEIXIN
+			seav() {
+				uni.getImageInfo({
+					src: this.imgSrc,
+					complete: function(result) {
+						let path = result.path;
+						uni.getSetting({
+							success(res) {
+								console.log(res)
+								if (!res.authSetting['scope.writePhotosAlbum']) {
+									uni.authorize({
+										scope: 'scope.writePhotosAlbum',
+										success(res) {
+											uni.saveImageToPhotosAlbum({
+												filePath: path,
+												complete(result) {}
+											});
+										},
+										complete(result) {
+											uni.showToast({
+												title: '请先授权保存图片',
+												duration: 2000,
+												icon: 'none'
+											});
+											obj.seav();
+										}
+									})
+								} else {
+									uni.saveImageToPhotosAlbum({
+										filePath: path,
+										complete(result) {
+											uni.showToast({
+												title: '保存图片成功！',
+												duration: 2000,
+												icon: 'none'
+											});
+										}
+									});
+								}
+							}
+						});
+					}
+				});
+			}
+			// #endif
+		}
+	};
+</script>
 
-				// 如果主图，二维码图片，设备信息都获取成功，开始绘制海报，这里需要用setTimeout延时绘制，否则可能会出现图片不显示。
-				if (this.goodsImg.errMsg == 'getImageInfo:ok' && this.ewmImg.errMsg == 'getImageInfo:ok' && this
-					.SystemInfo.errMsg == 'getSystemInfo:ok') {
-					console.log('ok')
-					uni.showToast({
-						icon: 'loading',
-						mask: true,
-						duration: 10000,
-						title: '海报绘制中',
-					});
-					setTimeout(() => {
-						var ctx = uni.createCanvasContext('myCanvas', this);
-						// 填充背景色，白色
-						ctx.setFillStyle('#fff'); // 默认白色
-						ctx.fillRect(0, 0, this.canvasW, this.canvasH) // fillRect(x,y,宽度，高度)
+<style lang="scss">
+	page {
+		height: 100%;
+	}
 
-						// 绘制商品主图，二维码
-						ctx.drawImage(this.goodsImg.path, 0, 0, this.canvasW, this
-							.canvasH) // drawImage(图片路径,x,y,绘制图像的宽度，绘制图像的高度)
-						ctx.fillRect((this.canvasW / 2 - this.ewmBg / 2), this.canvasH - 70 *
-							this.ratio - this.ewmBg, this.ewmBg, this.ewmBg) // fillRect(x,y,宽度，高度)
+	.imgw750h375 {
+		width: 100%;
+		height: 958rpx;
+	}
 
-						ctx.drawImage(this.ewmImg.path, (this.canvasW / 2 - this.ewmW / 2), this.canvasH - 85 *
-							this.ratio - this.ewmW,
-							this.ewmW, this.ewmW) // drawImage(图片路径,x,y,绘制图像的宽度，绘制图像的高度,二维码的宽,高)
+	.matop {
+		// margin-top: 40rpx;
+	}
 
-						// 3、绘制商品标题，多余文字自动换行
-						ctx.setFontSize(16); // setFontSize() 设置字体字号
-						ctx.setFillStyle('#333'); // setFillStyle() 设置字体颜色
+	.andr-shQ-padL30 {
+		// padding-left: 30rpx;
+	}
 
-						/* str 这段代码是我百度找的，参考别人的。canvas不能自动换行，需要自行计算 */
-						// let _strlineW = 0;
-						// let _strLastIndex = 0; //每次开始截取的字符串的索引
-						// let _strHeight = this.canvasW +20; //绘制字体距离canvas顶部的初始高度
-						// let _num = 1;
-						// for (let i = 0; i < this.title.length; i++) {
-						// 	_strlineW += ctx.measureText(this.title[i]).width;
-						// 	if (_strlineW > this.canvasW-155) {
-						// 		if(_num == 2 && 2){
-						// 			//文字换行数量大于二进行省略号处理
-						// 			ctx.fillText(this.title.substring(_strLastIndex, i-5)+'...', 40, _strHeight);
-						// 			_strlineW = 0;
-						// 			_strLastIndex = i;
-						// 			_num++;
-						// 			break;
-						// 		}else{
-						// 			ctx.fillText(this.title.substring(_strLastIndex, i), 40, _strHeight);
-						// 			_strlineW = 0;
-						// 			_strHeight += 20;
-						// 			_strLastIndex = i;
-						// 			_num++;
-						// 		}
-						// 	}else if (i == this.title.length - 1) {
-						// 		ctx.fillText(this.title.substring(_strLastIndex, i + 1), 40, _strHeight);
-						// 		_strlineW = 0;
-						// 	}
-						// }
-						/* end */
+	.andr-shQ-padR30 {
+		// padding-right: 30rpx;
+	}
 
-						// ctx.setFontSize(16) // 字号
-						// ctx.setFillStyle('#e31d1a') // 颜色
-						// ctx.fillText('￥'+this.price, 10, this.canvasW +75); // （文字，x，y）
-						// ctx.setFontSize(12)
-						// ctx.setFillStyle('#b8b8b8')
-						// ctx.fillText('原价￥'+this.Oldprice, 100, this.canvasW +75);
+	.andr-shQ-Flex {
+		// display: flex;
+	}
 
+	.andr-shQ-FlexDirC {
+		flex-direction: column;
+	}
 
-						// 邀请信息
-						// ctx.setFontSize(16)
-						// ctx.setFillStyle('#333')
-						// ctx.fillText('长按二维码立即预约', this.ewmW + 40, this.canvasW +100);
+	.andr-shQ-w100B {
+		// width: 100%;
+	}
 
-						// ctx.setFontSize(16)
-						// ctx.setFillStyle('#333')
-						// ctx.fillText('分享自小程序', this.ewmW + 40, this.canvasW +120);
-						ctx.draw(false, (ret) => { // draw方法 把以上内容画到 canvas 中。
-							console.log(ret)
-							uni.showToast({
-								icon: 'none',
-								title: '生成成功！',
-							});
-							that.fina = true
-							uni.canvasToTempFilePath({ // 保存canvas为图片
-								canvasId: 'myCanvas',
-								quality: 1,
-								fileType: 'jpg',
-								complete: function(res) {
-									// 在H5平台下，tempFilePath 为 base64, // 图片提示跨域 H5保存base64失败，APP端正常输出临时路径
-									console.log(res)
-									that.canvasShow = false
-									that.shareQrcodeUrl = res.tempFilePath
-									that.$forceUpdate()
-									setTimeout(function() {
-										console.log(that.shareQrcodeUrl, that
-											.canvasShow)
-									}, 2000)
-								},
-							})
-						});
-					}, 1500)
-				} else {
-					console.log('err')
-				}
-			},
-			// 获取图片信息
-			getImageInfo(image) {
-				return new Promise((req, rej) => {
-					uni.getImageInfo({
-						src: image,
-						success: function(res) {
-							req(res)
-						},
-					});
-				})
-			},
+	.andr-shQ-JusCC {
+		justify-content: center;
+	}
 
-			// 获取设备信息
-			getSystemInfo() {
-				return new Promise((req, rej) => {
-					uni.getSystemInfo({
-						success: function(res) {
-							req(res)
-						}
-					});
-				})
-			},
-			//保存图片
-			saveShareQrcode() {
-				console.log(this.shareQrcodeUrl)
-				uni.saveImageToPhotosAlbum({
-					filePath: this.shareQrcodeUrl,
-					success: (res) => {
-						uni.showToast({
-							icon: 'none',
-							position: 'bottom',
-							title: "成功保存到相册",
-						});
-					},
-					fail: (err) => {
-						//重新提示用户打开保存图片的授权
-						if (err.errMsg === "saveImageToPhotosAlbum:fail auth deny") {
-							uni.showModal({
-								title: '提示',
-								content: '需要您授权保存相册',
-								showCancel: false,
-								success(res) {
-									if (res.confirm) {
-										uni.openSetting({
-											success(settingdata) {
-												if (settingdata.authSetting[
-														'scope.writePhotosAlbum']) {
-													uni.showModal({
-														title: '提示',
-														content: '获取权限成功,再次保存图片即可成功',
-														showCancel: false,
-													})
-												} else {
-													uni.showModal({
-														title: '提示',
-														content: '获取权限失败，无法保存到相册',
-														showCancel: false
-													})
-												}
-											}
-										})
-									}
-								}
-							})
-						}
-					},
-				})
-			}
-		}
+	.andr-shQ-marginT30 {
+		// margin-top: 30rpx;
 	}
-</script>
 
-<style lang="scss">
-	.hb {
-		margin: auto;
+	.andr-shQ-bgc06B163 {
+		background-color: $base-color;
 	}
 
-	.qrimg {
-		position: absolute;
-		left: -9999rpx;
-		top: -9999rpx;
+	.andr-shQ-cFFF {
+		color: #ffffff;
 	}
 
-	button {
-		height: 88upx;
-		background-color: #feca00;
-		color: #fff;
-		border-radius: 44upx;
-		text-align: center;
-		line-height: 88upx;
-		width: 60%;
-		margin: 0 auto;
-		margin-top: 30upx;
+	.andr-shQ-bdR50 {
+		border-radius: 50rpx;
+	}
+
+	.andr-shQ-h86 {
+		height: 86rpx;
 	}
 
-	.btm-btn {
-		position: fixed;
-		bottom: 0;
-		width: 750rpx;
-		height: 200rpx;
-		display: flex;
-		background-color: #fff;
-		border-radius: 20rpx 20rpx 0 0;
+	.andr-shQ-AIC {
+		align-items: center;
+	}
 
-		.btn {
-			width: 50%;
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-			font-size: 26rpx;
+	.baocun {
+		color: #ffffff;
+		background: $base-color;
+		text-align: center;
+		width: 80%;
+		margin: 50rpx auto;
+		font-size: 28rpx;
+		padding: 25rpx 0rpx;
+		border-radius: 50rpx;
+	}
 
-			image {
-				width: 66rpx;
-				height: 66rpx;
-				margin-bottom: 20rpx;
-			}
-		}
+	.btn {
+		padding: 0rpx 0rpx !important;
+		margin: 0rpx auto;
+		margin-bottom: 100rpx;
 	}
+
+	/* #ifdef H5 */
+	.cbnagan {
+		width: 80%;
+		background: $base-color;
+		margin: 50rpx auto;
+		font-size: 28rpx;
+		text-align: center;
+	}
+
+	/* #endif */
 </style>

pages/user/team.vue

@@ -9,7 +9,7 @@
 				<view class="header">我的推广</view>
 			</view>
 			<view class="content-bg">
-				<image src="../../static/img/break-bg.png" mode=""></image>
+				<image src="../../static/img/team.png" mode=""></image>
 			</view>
 			<view class="money-box">
 				<view class="money">{{ all || '0' }}</view>

pages/user/user.vue

@@ -14,26 +14,26 @@
 					<view class="phone" v-if="userInfo.phone">{{ userInfo.phone | hiddenphone }}</view>
 				</view>
 			</view>
-			<view class="config" v-if="userInfo.is_promoter != 0">
+			<view class="config" v-if="userInfo.vip">
 				<view class="setting">
 					<image src="../../static/icon/set.png" mode=""></image>
 				</view>
-				<view class="config-font">VIP会员</view>
+				<view class="config-font">{{userInfo.vip_name}}</view>
 			</view>
 		</view>
-		<view class="user-money flex">
+		<view class="user-money flex" v-if="userInfo.vip">
 			<view class="user-money-item" @click="navTo('/pages/user/award')">
 				<view class="user-money-num">{{ userInfo.brokerage_price * 1 || 0 }}</view>
 				<view class="user-money-font">我的佣金</view>
 			</view>
 			<view class="user-xian"></view>
-			<view class="user-money-item">
-				<view class="user-money-num">{{ userInfo.pay_money * 1 || 0 }}</view>
+			<view class="user-money-item" @click="navTo('/pages/user/yue')">
+				<view class="user-money-num">{{ userInfo.now_money * 1 || 0 }}</view>
 				<view class="user-money-font">我的消费金</view>
 			</view>
 			<view class="user-xian"></view>
 			<view class="user-money-item" @click="navTo('/pages/user/team')">
-				<view class="user-money-num">{{ userInfo.award_range *1|| 0 }}</view>
+				<view class="user-money-num">{{ all }}</view>
 				<view class="user-money-font">我的推广</view>
 			</view>
 		</view>
@@ -64,7 +64,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="user-list flex" @click="navTo('/pages/user/shareQrCode')">
+		<view class="user-list flex" @click="navTo('/pages/user/shareQrCode')" v-if="userInfo.vip">
 			<image src="../../static/icon/u1.png" mode="widthFix" class="left-img"></image>
 			<view class="">推广海报</view>
 			<image src="../../static/icon/back.png" mode="" class="right-img"></image>
@@ -138,8 +138,8 @@
 				store_name: '',
 				achievement: '',
 				code: '',
-				all: '',
-				text: 'tingjiu1688' //客服微信
+				all: 0,
+				text: '', //客服微信
 			};
 		},
 		onShow() {
@@ -274,6 +274,20 @@
 					.catch(e => {
 						console.log(e);
 					});
+				spread({
+						page: 1,
+						limit: 1
+					})
+					.then(({
+						data
+					}) => {
+						console.log(data);
+						this.all = data.total;
+					})
+					.catch(e => {
+						console.log(e);
+					});
+
 			},
 			/**
 			 * 统一跳转接口,拦截未登录路由
@@ -281,19 +295,16 @@
 			 */
 			navTo(url) {
 				console.log(url);
-				// if (!this.hasLogin) {
-				// 	// 保存地址
-				// 	saveUrl();
-				// 	// 登录拦截
-				// 	interceptor();
-				// } else {
-				// 	uni.navigateTo({
-				// 		url
-				// 	});
-				// }
-				uni.navigateTo({
-					url
-				});
+				if (!this.hasLogin) {
+					// 保存地址
+					saveUrl();
+					// 登录拦截
+					interceptor();
+				} else {
+					uni.navigateTo({
+						url
+					});
+				}
 			},
 			close() {
 				this.$refs.popuphx.close();
@@ -416,8 +427,7 @@
 		}
 
 		.config {
-			width: 161rpx;
-			height: 51rpx;
+			padding: 10rpx 20rpx;
 			background: #ffffff;
 			border-radius: 25rpx;
 			display: flex;
@@ -440,7 +450,7 @@
 				font-size: 25rpx;
 				font-family: PingFang SC;
 				font-weight: 500;
-				color: #ee2f72;
+				color: #fd7811;
 			}
 		}
 	}

pages/user/yue.vue

@@ -1,34 +1,53 @@
 <template>
 	<view class="content">
-		<view class="top-bg"></view>
-		<view class="yue-wrap flex">
-			<view class="yue-tit flex">
-				<view class="yue-left">总资产(CNY)</view>
-				<view class="tx" @click="navto('/pages/money/wallet')">
-					<image src="../../static/icon/hz.png" mode="widthFix"></image>
-					余额互转
+		<view class="content-money">
+			<view class="status_bar"><!-- 这里是状态栏 --></view>
+			<view class="body-title">
+				<view class="goback-box" @click="toBack">
+					<image class="goback" src="../../static/icon/fanhui.png" mode=""></image>
 				</view>
+				<view class="header">我的消费金</view>
 			</view>
-			<view class="yue-num flex">
-				<view class="yue">{{ userInfo.now_money || '0.00' }}</view>
-				<view class="">
-					<!-- <view class="cz" @click="navto('/pages/money/recharge')">
-						充值
-						<image src="../../static/icon/dz.png" mode="widthFix"></image>
-					</view> -->
-
-				</view>
+			<view class="content-bg">
+				<image src="../../static/img/break-bg.png" mode=""></image>
+			</view>
+			<view class="money-box">
+				<view class="money">{{ userInfo.now_money || 0 }}</view>
+				<view>我的消费金</view>
 			</view>
-			<view class="lj-wrap flex">
-				<view class="">累计消费：￥{{ userInfo.orderStatusSum || '0' }}</view>
-				<view class="">累计充值：￥{{ userInfo.recharge || '0' }}</view>
+			<view class="moneybtn-box">
+				<view class="money-btn"></view>
+				<view class="money-btn" @click="open()">
+					<!-- <image class="money-btn-icon" src="../../static/img/tix.png" mode=""></image> -->
+					<view class="money-font">
+						收款码
+					</view>
+				</view>
+				<!-- <view class="money-btn" @click="navto('/pages/user/yjzye')">
+					<image class="money-btn-icon" src="../../static/img/tr.png" mode=""></image>
+					<view class="money-font">
+						转换余额
+					</view>
+				</view> -->
 			</view>
 		</view>
+
+		<!-- <view class="info-box flex">
+			<view class="info-item">
+				<view class="info-font">累计收入</view>
+				<view class="info-num">{{ recharge || '0' }}</view>
+			</view>
+			<view class="shu"></view>
+			<view class="info-item">
+				<view class="info-font">累计支出</view>
+				<view class="info-num">{{ orderStatusSum || '0' }}</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>
 		</view>
-		<swiper :current="tabCurrentIndex" :style="{ height: maxheight }" class="swiper-box" duration="300"
+		<swiper :current="tabCurrentIndex" :style="{ height: height }" class="swiper-box" duration="300"
 			@change="changeTab">
 			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
 				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
@@ -40,7 +59,7 @@
 						<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
 							<view class="title-box">
 								<view class="title">
-									<text>{{ item.mark }}</text>
+									<text>{{ item.title }}</text>
 								</view>
 								<view class="time">
 									<text>{{ item.add_time }}</text>
@@ -56,7 +75,19 @@
 				</scroll-view>
 			</swiper-item>
 		</swiper>
+		<uni-popup ref="skm" type="center" :maskClick="false">
+
+			<view class="qrimg">
+				<view class="qx" @click="closes">
+					X
+				</view>
+				<tki-qrcode cid="tki-qrcode-canvas" ref="qrcode" :val="myewm" :size="180" unit="upx"
+					background="#ffffff" foreground="#333333" pdground="#333333" :iconSize="40" :lv="3" :onval="true"
+					:loadMake="true" :usingComponents="true" :showLoading="true" loadingText="二维码生成中" />
+			</view>
+		</uni-popup>
 	</view>
+
 </template>
 
 <script>
@@ -64,18 +95,18 @@
 		mapState,
 		mapMutations
 	} from 'vuex';
-	import {
-		integral,
-		userBalance
-	} from '@/api/wallet.js';
 	import {
 		getMoneyStyle
 	} from '@/utils/rocessor.js';
 	import {
-		getUserInfo,
-	} from '@/api/user.js';
+		mapGetters
+	} from 'vuex';
 	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
 	import empty from '@/components/empty';
+	import {
+		extractBank,
+		spreadCommission
+	} from '@/api/wallet.js';
 	export default {
 		filters: {
 			getMoneyStyle
@@ -84,15 +115,19 @@
 			empty,
 			uniLoadMore
 		},
-		onReady() {
-			// 初始化获取页面宽度
-			var obj = this;
+		computed: {
+			...mapState('user', ['userInfo']),
+			...mapState(['baseURL'])
+		},
+		onReady(res) {
+			var _this = this;
 			uni.getSystemInfo({
 				success: resu => {
 					const query = uni.createSelectorQuery();
 					query.select('.swiper-box').boundingClientRect();
 					query.exec(function(res) {
-						obj.maxheight = resu.windowHeight - res[0].top + 'px';
+						_this.height = resu.windowHeight - res[0].top + 'px';
+						console.log('打印页面的剩余高度', _this.height);
 					});
 				},
 				fail: res => {}
@@ -100,59 +135,62 @@
 		},
 		data() {
 			return {
+				myewm: '',
+				yj: '',
+				height: '',
 				// 头部图高度
 				maxheight: '',
 				tabCurrentIndex: 0,
-				num: '',
+				orderStatusSum: 0,
+				recharge: 0,
 				navList: [{
-						state: 0,
-						text: '支出',
+						state: 2,
+						text: '收入',
 						loadingType: 'more',
 						orderList: [],
 						page: 1, //当前页数
-						limit: 10, //每次信息条数
-						loaded: false
+						limit: 10 //每次信息条数
 					},
 					{
 						state: 1,
-						text: '收入',
+						text: '支出',
 						loadingType: 'more',
 						orderList: [],
 						page: 1, //当前页数
-						limit: 10, //每次信息条数
-						loaded: false
-					},
+						limit: 10 //每次信息条数
+					}
 				],
-				money: '',
-				userInfo: {}
+				money: ''
 			};
 		},
-		onLoad(options) {},
+		onLoad(options) {
+
+		},
 		onShow() {
+			this.extractBank();
 			this.loadData();
-			this.getUserInfo();
 		},
 		methods: {
-			...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
-			getUserInfo() {
-				getUserInfo({}).then(({
-					data
-				}) => {
-					this.userInfo = data;
+			extractBank() {
+				extractBank().then(res => {
+					console.log(res);
+					this.yj = res.data.brokerage_price;
+				});
+			},
+			toBack() {
+				uni.switchTab({
+					url: '/pages/user/user'
 				});
 			},
+			closes(e) {
+				this.$refs.skm.close();
+			},
 			// 页面跳转
 			navto(e) {
 				uni.navigateTo({
 					url: e
 				});
 			},
-			open() {
-				this.$refs.popuphx.open();
-			},
-			close() {
-				this.$refs.popuphx.close();
-			},
 			//获取收入支出信息
 			async loadData(source) {
 				//这里时将订单挂载到tab列表下
@@ -170,19 +208,19 @@
 				//修改当前对象状态为加载中
 				navItem.loadingType = 'loading';
 
-				integral({
+				spreadCommission({
 						page: navItem.page,
 						limit: navItem.limit,
-						category: 'now_money',
-						pm: state
-					})
+					}, state)
 					.then(({
 						data
 					}) => {
 						if (data.length > 0) {
-							navItem.orderList = navItem.orderList.concat(data);
-							navItem.page++;
+							data.forEach(e => {
+								navItem.orderList = navItem.orderList.concat(e.list);
+							})
 						}
+						navItem.page++;
 						//判断是否还有数据, 有改为more, 没有改为noMore
 						if (navItem.limit == data.length) {
 							navItem.loadingType = 'more';
@@ -207,10 +245,12 @@
 			tabClick(index) {
 				this.tabCurrentIndex = index;
 			},
-			addmoney() {
-				uni.navigateTo({
-					url: '/pages/money/recharge'
-				});
+			open() {
+				console.log(this.baseURL, this.userInfo.uid);
+				this.myewm = this.baseURL + '/index/#/pages/money/wallet?id=' + this.userInfo.uid + '&nickname=' + this
+					.userInfo.nickname;
+				console.log(this.myewm);
+				this.$refs.skm.open();
 			}
 		}
 	};
@@ -218,102 +258,166 @@
 
 <style lang="scss">
 	page {
-		background-color: #fff;
-		height: auto;
-		min-height: 100%;
+		background: #f1f1f1;
+		height: 100%;
 	}
 
-	.top-bg {
-		background-color: #ff4c4c;
-		height: 180rpx;
-		width: 750rpx;
+	.status_bar {
+		height: var(--status-bar-height);
+		width: 100%;
 	}
 
-	.yue-wrap {
-		width: 670rpx;
-		height: 320rpx;
-		margin: -160rpx auto 30rpx;
-		background: linear-gradient(-70deg, #ff9265, #ff6762);
-		box-shadow: 0px 15rpx 22rpx 6rpx rgba(255, 122, 99, 0.1);
-		border-radius: 25rpx;
-		color: #fff;
-		font-size: 26rpx;
-		padding: 50rpx 75rpx;
-		flex-direction: column;
-		justify-content: space-between;
-		align-items: flex-start;
+	.content-money {
+		position: relative;
+		height: 480rpx;
 
-		.yue-tit {
-			width: 100%;
-		}
+		.content-bg {
+			position: absolute;
+			top: 0;
+			left: 0;
+			right: 0;
+			width: 750rpx;
+			height: 480rpx;
 
-		.cz {
 			image {
-				width: 13rpx;
-				margin-left: 10rpx;
+				width: 100%;
+				height: 100%;
 			}
 		}
 
-		.tx {
-			image {
-				width: 30rpx;
-				margin-right: 10rpx;
+		.body-title {
+			height: 80rpx;
+			text-align: center;
+			font-size: 35rpx;
+			position: relative;
+
+			.header {
+				position: absolute;
+				left: 0;
+				top: 0;
+				width: 100%;
+				font-size: 36rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #fffeff;
+				height: 80rpx;
+				font-size: 36rpx;
+				font-weight: 700;
+				z-index: 9;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+
+			.goback-box {
+				position: absolute;
+				left: 18rpx;
+				top: 0;
+				height: 80rpx;
+				display: flex;
+				align-items: center;
+			}
+
+			.goback {
+				z-index: 100;
+				width: 34rpx;
+				height: 34rpx;
 			}
 		}
+	}
+
+	.info-box {
+		width: 670rpx;
+		height: 186rpx;
+		background: #ffffff;
+		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+		border-radius: 20rpx;
+		margin: -80rpx auto 0;
+		position: relative;
+		z-index: 2;
 
-		.yue-num {
-			width: 100%;
-			justify-content: space-between;
+		.info-item {
+			width: 50%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			line-height: 1;
 
-			.yue {
-				font-size: 76rpx;
+			.info-font {
+				font-size: 30rpx;
+				font-family: PingFang SC;
 				font-weight: bold;
+				color: #999999;
 			}
 
-			.cz {
-				image {
-					width: 13rpx;
-					margin-left: 10rpx;
-				}
+			.info-num {
+				margin-top: 30rpx;
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #181818;
 			}
 		}
 
-		.lj-wrap {
-			width: 100%;
-			justify-content: space-between;
-			font-size: 24rpx;
+		.shu {
+			width: 2rpx;
+			height: 74rpx;
+			background: #dcdfe6;
 		}
 	}
 
-	.swiper-box {
-		.order-item:last-child {
-			margin-bottom: 60rpx;
+	.money-box {
+		position: relative;
+		z-index: 2;
+		/* #ifdef H5 */
+		padding-top: 90rpx;
+		/* #endif */
+		color: #ffffff;
+		text-align: center;
+		/* #ifdef APP-PLUS */
+		height: 200rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		/* #endif */
+		/* #ifdef MP-WEIXIN */
+		padding-top: 40rpx;
+		/* #endif */
+
+		.money {
+			font-size: 72rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #ffffff;
 		}
 
-		.order-item {
-			padding: 20rpx 30rpx;
-			line-height: 1.5;
+		.text {
+			font-size: 30rpx;
+		}
+	}
 
-			.title-box {
-				.title {
-					font-size: $font-lg;
-					color: $font-color-base;
-				}
+	.moneybtn-box {
+		display: flex;
+		justify-content: space-between;
+		position: relative;
+		z-index: 2;
+		color: #ffffff;
+		padding: 0rpx 50rpx;
+		font-size: 30rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
 
-				.time {
-					font-size: $font-base;
-					color: $font-color-light;
-				}
-			}
+		.money-btn {
+			display: flex;
+			align-items: center;
 
-			.money {
-				color: #fd5b23;
-				font-size: $font-lg;
-				text-align: right;
+			.money-btn-icon {
+				width: 40rpx;
+				height: 40rpx;
+			}
 
-				.status {
-					color: $font-color-light;
-				}
+			.money-font {
+				margin-left: 10rpx;
 			}
 		}
 	}
@@ -356,8 +460,85 @@
 		}
 	}
 
+	//列表
+	.swiper-box {
+		.order-item:last-child {
+			margin-bottom: 60rpx;
+		}
+
+		.order-item {
+			padding: 20rpx 30rpx;
+			line-height: 1.5;
+
+			.title-box {
+				.title {
+					font-size: $font-lg;
+					color: $font-color-base;
+				}
+
+				.time {
+					font-size: $font-base;
+					color: $font-color-light;
+				}
+			}
+
+			.money {
+				color: #fd5b23;
+				font-size: $font-lg;
+				text-align: right;
+
+				.status {
+					color: $font-color-light;
+				}
+			}
+		}
+	}
+
 	.list-scroll-content {
 		background: #ffffff;
 		height: 100%;
 	}
+
+	.content {
+		height: 100%;
+
+		.empty-content {
+			background-color: #ffffff;
+		}
+	}
+
+	.btn-box {
+		width: 674rpx;
+		height: 88rpx;
+		background: linear-gradient(0deg, #2e58ff, #32c6ff);
+		border-radius: 44rpx;
+		font-size: 36rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #ffffff;
+		text-align: center;
+		line-height: 88rpx;
+		position: fixed;
+		bottom: 48rpx;
+		left: 0;
+		right: 0;
+		margin: 0 auto;
+	}
+
+	.qrimg {
+		width: 400rpx;
+		height: 400rpx;
+		border-radius: 20rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		background-color: #fff;
+		position: relative;
+
+		.qx {
+			position: absolute;
+			top: 20rpx;
+			right: 20rpx;
+		}
+	}
 </style>

store/index.js

@@ -5,8 +5,7 @@ Vue.use(Vuex)
 
 const store = new Vuex.Store({
 	state: {
-		// baseURL:"http://yrh.liuniu946.com",//'http://eb.shuibo.net',//请求地址配置 
-		baseURL: 'http://www.tingjiu.liuniukj.com', //请求地址配置 
+		baseURL: 'http://qqlx.liuniukj.com', //请求地址配置 
 		urlFile: '/index', //项目部署所在文件夹
 		userInfo: {}, //登录信息
 		loginInterceptor: false, //是否打开强制登录

uni.scss

@@ -5,7 +5,7 @@ $page-row-spacing: 30rpx;
 $page-color-base: #f8f8f8; //页面背景颜色
 $page-color-light: #f8f6fc;
 // 主题颜色
-$base-color: #dc262b; //项目颜色
+$base-color: #fd7811; //项目颜色
 $box-shadow-color: #5dbc7c; //阴影颜色
 $font-color: #5dbc7c; //字体颜色
 $font-color-spec: #5dbc7c; //可操作文字颜色

unpackage/dist/build/h5/index.html

@@ -1,2 +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.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.3e31b09f.js></script><script src=/index/static/js/index.1faba575.js></script></body></html>
+<!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.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.3e31b09f.js></script><script src=/index/static/js/index.f4f7ecbe.js></script></body></html>