123456

App.vue

@@ -19,57 +19,55 @@ export default {
 		};
 	},
 	methods: {
-		...mapMutations('user', ['setUserInfo', 'login', 'hasLogin','setDes','setStoreInfo','setLatlng', 'setLatitude', 'setLongitude','logout']),
-		getaddress() {
-			let obj = this;
-			uni.getLocation({
-				type: 'gcj02',
-				success: res => {
-					uni.removeStorageSync('latlon');
-					let latlon = Math.abs(res.latitude) + ',' + Math.abs(res.longitude);
-					
-					console.log('app页+++++++++++++++++++++')
-					obj.setLatlng(latlon);
-					obj.setLatitude(Math.abs(res.latitude));
-					obj.setLongitude(Math.abs(res.longitude));
-					uni.setStorageSync('latlon', latlon);
-					obj.setMrStore(Math.abs(res.latitude), Math.abs(res.longitude));
-				},
-				fail: err => {
-					console.log('失败')
-					openMap().then(e => {
-						this.getaddress();
-					});
-				}
-			});
-		},
-		setMrStore(latitude = '', longitude = '') {
-			//checkedStore
-		
-			getStoreList({
-				latitude: latitude,
-				longitude: longitude,
-				page: 1,
-				limit: 1
-			}).then(({ data }) => {
-				console.log(data, '店面列表');
-				if (data.list[0]) {
-					// data.list[0].space = data.list[0].latitude + ',' + data.list[0].longitude;
-					this.setDes(data.list[0].distance);
-					this.setStoreInfo(data.list[0]);
-				}
-			});
-		},
+		...mapMutations('user', ['setUserInfo', 'login', 'hasLogin', 'setDes', 'setStoreInfo', 'setLatlng', 'setLatitude', 'setLongitude', 'logout'])
+		// getaddress() {
+		// 	let obj = this;
+		// 	uni.getLocation({
+		// 		type: 'gcj02',
+		// 		success: res => {
+		// 			uni.removeStorageSync('latlon');
+		// 			let latlon = Math.abs(res.latitude) + ',' + Math.abs(res.longitude);
+
+		// 			console.log('app页+++++++++++++++++++++')
+		// 			obj.setLatlng(latlon);
+		// 			obj.setLatitude(Math.abs(res.latitude));
+		// 			obj.setLongitude(Math.abs(res.longitude));
+		// 			uni.setStorageSync('latlon', latlon);
+		// 			obj.setMrStore(Math.abs(res.latitude), Math.abs(res.longitude));
+		// 		},
+		// 		fail: err => {
+		// 			console.log('失败')
+		// 			openMap().then(e => {
+		// 				this.getaddress();
+		// 			});
+		// 		}
+		// 	});
+		// },
+		// setMrStore(latitude = '', longitude = '') {
+
+		// 	getStoreList({
+		// 		latitude: latitude,
+		// 		longitude: longitude,
+		// 		page: 1,
+		// 		limit: 1
+		// 	}).then(({ data }) => {
+		// 		console.log(data, '店面列表');
+		// 		if (data.list[0]) {
+		// 			this.setDes(data.list[0].distance);
+		// 			this.setStoreInfo(data.list[0]);
+		// 		}
+		// 	});
+		// }
 	},
 	onLaunch: function(urlObj) {
 		let obj = this;
-		console.log('app 开始')
+		console.log('app 开始');
 		//清除店铺缓存newStore
-		uni.removeStorageSync('newStore')
+		uni.removeStorageSync('newStore');
 		// obj.logout()
 		// 加载缓存中的用户信息
 		let userInfo = uni.getStorageSync('userInfo') || '';
-		let checkedStore = uni.getStorageSync('store') || ''
+		let checkedStore = uni.getStorageSync('store') || '';
 		// 判断是否拥有用户信息
 		if (userInfo.uid) {
 			//更新登陆状态
@@ -80,10 +78,10 @@ export default {
 					obj.login(res.data);
 				}
 			});
-		}else {
-			obj.logout()
+		} else {
+			obj.logout();
 		}
-		this.getaddress()
+		this.getaddress();
 		// if(checkedStore.id) {
 		// 	console.log('有店铺信息')
 		// 	//保存店铺信息
@@ -125,7 +123,6 @@ export default {
 			});
 		}
 		// #endif
-		
 	},
 	onShow: function() {
 		// 加载拦截
@@ -326,28 +323,25 @@ page {
 }
 
 //首页边框
-$border: solid 4rpx #ECD49E;
-$background-image: url(https://zccy.liuniu946.com/static/img/frame-1.png),
-		url(https://zccy.liuniu946.com/static/img/frame-2.png),
-		url(https://zccy.liuniu946.com/static/img/frame-4.png),
-		url(https://zccy.liuniu946.com/static/img/frame-3.png);
+$border: solid 4rpx #ecd49e;
+$background-image: url(https://zccy.liuniu946.com/static/img/frame-1.png), url(https://zccy.liuniu946.com/static/img/frame-2.png),
+	url(https://zccy.liuniu946.com/static/img/frame-4.png), url(https://zccy.liuniu946.com/static/img/frame-3.png);
 $background-repeat: no-repeat, no-repeat, no-repeat, no-repeat;
 $background-position: top left, top right, bottom left, bottom right;
 .border-index {
 	border-radius: 10rpx;
-	background-color: #FFFFFF;
+	background-color: #ffffff;
 	border: $border;
 	background-image: $background-image;
 	background-repeat: $background-repeat;
 	background-position: $background-position;
 }
-.scroll_box{
+.scroll_box {
 	overflow: hidden;
 	white-space: nowrap;
 }
-.item_list{
+.item_list {
 	height: auto;
 	display: inline-block;
 }
-	
 </style>

api/user.js

@@ -1,286 +1,306 @@
-import request from '@/utils/request'
-import { upFilse } from '@/utils/request';
-
-//用户修改信息
-export function edit(data) {
-	return request({
-		url: '/api/user/edit',
-		method: 'post',
-		data
-	});
-}
-
-// 订单统计信息
-export function orderData(data) {
-	return request({
-		url: '/api/order/data',
-		method: 'get',
-		data
-	});
-}
-
-// 获取用户信息
-export function getUserInfo(data) {
-	return request({
-		url: '/api/userinfo',
-		method: 'get',
-		data
-	});
+import request from '@/utils/request'
+import {
+	upFilse
+} from '@/utils/request';
+
+//用户修改信息
+export function edit(data) {
+	return request({
+		url: '/api/user/edit',
+		method: 'post',
+		data
+	});
 }
 
-// 获取用户信息
-export function getUser(data) {
-	return request({
-		url: '/api/user',
-		method: 'get',
-		data
-	});
-}
-
-// 用户分享图
-export function spreadBanner(data) {
-	return request({
-		url: '/api/spread/banner',
-		method: 'get',
-		data
-	});
-}
-
-// 获取地址列表
-export function getAddressList(data) {
-	return request({
-		url: '/api/address/list',
-		method: 'get',
-		data
-	});
-}
-// 获取单个地址
-export function getAddress(data,id) {
-	return request({
-		url: '/api/address/detail/'+id,
-		method: 'get',
-		data
-	});
-}
-// 修改地址
-export function addressEdit(data) {
-	return request({
-		url: '/api/address/edit',
-		method: 'post',
-		data
-	});
-}
-// 删除地址
-export function addressDel(data) {
-	return request({
-		url: '/api/address/del',
-		method: 'post',
-		data
-	});
-}
-// 设为默认地址
-export function setAddressDefault(data) {
-	return request({
-		url: '/api/address/default/set',
-		method: 'post',
-		data
-	});
-}
-//获取默认地址
-export function getAddressDefault(data) {
-	return request({
-		url: '/api/address/default',
-		method: 'get',
-		data
-	});
-}
-// 购物车列表
-export function getCartList(data) {
-	return request({
-		url: '/api/cart/list',
-		method: 'get',
-		data
-	});
-}
-
-// 修改购物车数量
-export function getCartNum(data) {
-	return request({
-		url: '/api/cart/num',
-		method: 'post',
-		data
-	});
-}
-//删除购物车
-export function cartDel(data) {
-	return request({
-		url: '/api/cart/del',
-		method: 'post',
-		data
-	});
-}
-//获取收藏夹列表
-export function getcollectList(data) {
-	return request({
-		url: '/api/collect/user',
-		method: 'get',
-		data
-	});
-}
-// 取消收藏
-export function delcollect(data) {
-	return request({
-		url: '/api/collect/del',
-		method: 'post',
-		data
-	});
-}
-
-//上传图片
-export function upload(data){
-	return upFilse({
-		url:'/api/upload/image',
-		method:'post',
-		data
-	})
-}
-// 推广的人数
-export function getSpreadPeople(data){
-	return request({
-		url:'/api/spread/people',
-		method:'post',
-		data
-	})
-}
-
-//推广佣金/提现总和 
-//3=佣金,4=提现
-export function getSpreadCount(data,type) {
-	return request({
-		url:'/api/spread/count/'+type,
-		method:'get',
-		data
-	})
-}
-
-//bind_admin 
-export function bindAdmin(data) {
-	return request({
-		url:'/api/bind_admin',
-		method:'post',
-		data
-	})
-}
-
- // 订单核销
-export function orderVerific(data) {
-  return request({
-  	url:'/api/order/order_verific',
-  	method:'post',
-  	data
-  })
-}
-
-//核销列表
-export function getOrderList(data) {
-  return request({
-  	url:'/api/order/order_verific',
-  	method:'post',
-  	data
-  })
-}
-
-//获取管理商品列表
-export function getAllList(data) {
-	return request({
-		url:'/api/admin/order/list',
-		method:'get',
-		data
-	})
-}
-//admin/point自提点列表
-export function getPoint(data) {
-	return request({
-		url:'/api/admin/point',
-		method:'get',
-		data
-	})
-}
-//admin/point/5删除自提点
-export function delPoint(data,id) {
-	return request({
-		url:'/api/admin/point/' + id,
-		method:'delete',
-		data
-	})
-}
-//admin/point/1
-export function editPoint(data,id) {
-	return request({
-		url:'/api/admin/point/'+ id,
-		method:'post',
-		data
-	})
-}
-
-// 核销兑换券
-export function exchangeOrderVerific(data) {
-	return request({
-		url:'/api/order/exchange_order_verific',
-		method:'post',
-		data
-	})
-}
-
-//获取送货员列表
-export function getSHY(data) {
-	return request({
-		url:'/api/admin/sender',
-		method:'get',
-		data
-	})
-}
-
-//佣金明细
-export function getStoreCms(data) {
-	return request({
-		url:'/api/order/bill',
-		method:'get',
-		data
-	})
-}
-// 佣金提现
-export function cash(data) {
-	return request({
-		url:'/api/order/cash',
-		method:'post',
-		data
-	})
-}
-
-// 发放实体卡
-export function sendStk(data) {
-	return request({
-		url:'/api/admin/card/send',
-		method:'post',
-		data
-	})
-}
-
-// 核销实体卡
-export function checkStk(data) {
-	return request({
-		url:'/api/admin/card/check',
-		method:'post',
-		data
-	})
+// 订单统计信息
+export function orderData(data) {
+	return request({
+		url: '/api/order/data',
+		method: 'get',
+		data
+	});
+}
+
+// 获取用户信息
+export function getUserInfo(data) {
+	return request({
+		url: '/api/userinfo',
+		method: 'get',
+		data
+	});
+}
+
+// 获取用户信息
+export function getUser(data) {
+	return request({
+		url: '/api/user',
+		method: 'get',
+		data
+	});
+}
+
+// 用户分享图
+export function spreadBanner(data) {
+	return request({
+		url: '/api/spread/banner',
+		method: 'get',
+		data
+	});
+}
+
+// 获取地址列表
+export function getAddressList(data) {
+	return request({
+		url: '/api/address/list',
+		method: 'get',
+		data
+	});
+}
+// 获取单个地址
+export function getAddress(data, id) {
+	return request({
+		url: '/api/address/detail/' + id,
+		method: 'get',
+		data
+	});
+}
+// 修改地址
+export function addressEdit(data) {
+	return request({
+		url: '/api/address/edit',
+		method: 'post',
+		data
+	});
+}
+// 删除地址
+export function addressDel(data) {
+	return request({
+		url: '/api/address/del',
+		method: 'post',
+		data
+	});
+}
+// 设为默认地址
+export function setAddressDefault(data) {
+	return request({
+		url: '/api/address/default/set',
+		method: 'post',
+		data
+	});
+}
+//获取默认地址
+export function getAddressDefault(data) {
+	return request({
+		url: '/api/address/default',
+		method: 'get',
+		data
+	});
+}
+// 购物车列表
+export function getCartList(data) {
+	return request({
+		url: '/api/cart/list',
+		method: 'get',
+		data
+	});
+}
+
+// 修改购物车数量
+export function getCartNum(data) {
+	return request({
+		url: '/api/cart/num',
+		method: 'post',
+		data
+	});
+}
+//删除购物车
+export function cartDel(data) {
+	return request({
+		url: '/api/cart/del',
+		method: 'post',
+		data
+	});
+}
+//获取收藏夹列表
+export function getcollectList(data) {
+	return request({
+		url: '/api/collect/user',
+		method: 'get',
+		data
+	});
+}
+// 取消收藏
+export function delcollect(data) {
+	return request({
+		url: '/api/collect/del',
+		method: 'post',
+		data
+	});
+}
+
+//上传图片
+export function upload(data) {
+	return upFilse({
+		url: '/api/upload/image',
+		method: 'post',
+		data
+	})
+}
+// 推广的人数
+export function getSpreadPeople(data) {
+	return request({
+		url: '/api/spread/people',
+		method: 'post',
+		data
+	})
+}
+
+//推广佣金/提现总和 
+//3=佣金,4=提现
+export function getSpreadCount(data, type) {
+	return request({
+		url: '/api/spread/count/' + type,
+		method: 'get',
+		data
+	})
+}
+
+//bind_admin 
+export function bindAdmin(data) {
+	return request({
+		url: '/api/bind_admin',
+		method: 'post',
+		data
+	})
+}
+
+// 订单核销
+export function orderVerific(data) {
+	return request({
+		url: '/api/order/order_verific',
+		method: 'post',
+		data
+	})
+}
+
+//核销列表
+export function getOrderList(data) {
+	return request({
+		url: '/api/order/order_verific',
+		method: 'post',
+		data
+	})
+}
+
+//获取管理商品列表
+export function getAllList(data) {
+	return request({
+		url: '/api/admin/order/list',
+		method: 'get',
+		data
+	})
+}
+//admin/point自提点列表
+export function getPoint(data) {
+	return request({
+		url: '/api/admin/point',
+		method: 'get',
+		data
+	})
+}
+//admin/point/5删除自提点
+export function delPoint(data, id) {
+	return request({
+		url: '/api/admin/point/' + id,
+		method: 'delete',
+		data
+	})
+}
+//admin/point/1
+export function editPoint(data, id) {
+	return request({
+		url: '/api/admin/point/' + id,
+		method: 'post',
+		data
+	})
+}
+
+// 核销兑换券
+export function exchangeOrderVerific(data) {
+	return request({
+		url: '/api/order/exchange_order_verific',
+		method: 'post',
+		data
+	})
+}
+
+//获取送货员列表
+export function getSHY(data) {
+	return request({
+		url: '/api/admin/sender',
+		method: 'get',
+		data
+	})
+}
+
+//佣金明细
+export function getStoreCms(data) {
+	return request({
+		url: '/api/order/bill',
+		method: 'get',
+		data
+	})
+}
+// 佣金提现
+export function cash(data) {
+	return request({
+		url: '/api/order/cash',
+		method: 'post',
+		data
+	})
+}
+
+// 发放实体卡
+export function sendStk(data) {
+	return request({
+		url: '/api/admin/card/send',
+		method: 'post',
+		data
+	})
+}
+
+// 核销实体卡
+export function checkStk(data) {
+	return request({
+		url: '/api/admin/card/check',
+		method: 'post',
+		data
+	})
+}
+
+// 实体卡列表
+export function getStk(data) {
+	return request({
+		url: '/api/admin/card/send',
+		method: 'get',
+		data
+	})
+}
+
+// 发红包 
+export function redbag(data) {
+	return request({
+		url: '/api/red_bag/send',
+		method: 'post',
+		data
+	})
+}
+
+// 收红包
+export function getredbag(data, id) {
+	return request({
+		url: '/api/red_bag/get/' + id,
+		method: 'post',
+		data
+	})
 }
-
-// 实体卡列表
-export function getStk(data) {
-	return request({
-		url:'/api/admin/card/send',
-		method:'get',
-		data
-	})
-}

manifest.json

@@ -1,102 +1,103 @@
 {
-	"name": "某娘生鲜",
-	"appid": "__UNI__B86D5A3",
-	"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": "wx9336e89d8ad9f4ea",
-		"setting": {
-			"urlCheck": false,
-			"minified": true,
-			"postcss": false,
-			"es6": false
-		},
-		"permission": {
-			"scope.userLocation": {
-				"desc": "需要根据你的定位来给你推送最近的门店"
-			}
-		},
-		"requiredPrivateInfos": ["getLocation", "chooseLocation"]
-	},
-	"h5": {
-		"title": "某娘生鲜",
-		"domain": "",
-		"router": {
-			"base": "/index/",
-			"mode": "hash"
-		},
-		"devServer": {
-			"proxy": {
-				"/api": {
-					"target": "https://mnxs.liuniu946.com", //请求的目标域名
-					"changeOrigin": true,
-					// "secure": false,
-					"pathRewrite": {}
-				}
-			}
-		},
-		"sdkConfigs": {
-			"maps": {}
-		}
-	},
-	"mp-toutiao": {
-		"setting": {
-			"urlCheck": false
-		}
-	}
+    "name" : "某娘生鲜",
+    "appid" : "__UNI__0460A91",
+    "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" : "wx2dcd4315fee05b91",
+        "setting" : {
+            "urlCheck" : false,
+            "minified" : true,
+            "postcss" : false,
+            "es6" : false
+        },
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "需要根据你的定位来给你推送最近的门店"
+            }
+        },
+        "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ]
+    },
+    "h5" : {
+        "title" : "某娘生鲜",
+        "domain" : "",
+        "router" : {
+            "base" : "/index/",
+            "mode" : "hash"
+        },
+        "devServer" : {
+            "proxy" : {
+                "/api" : {
+                    "target" : "https://mnxs.liuniu946.com", //请求的目标域名
+                    "changeOrigin" : true,
+                    // "secure": false,
+                    "pathRewrite" : {}
+                }
+            }
+        },
+        "sdkConfigs" : {
+            "maps" : {}
+        }
+    },
+    "mp-toutiao" : {
+        "setting" : {
+            "urlCheck" : false
+        }
+    }
 }
 // "^/api": "/"
+

pages.json

@@ -177,6 +177,12 @@
 				"navigationBarBackgroundColor": "#f8f1f2"
 			}
 		},
+		{
+			"path": "pages/user/shareEx",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
 			"path": "pages/user/user",
 			"style": {
@@ -322,6 +328,12 @@
 						"navigationBarTitleText": "支付成功"
 					}
 				},
+				{
+					"path": "withdrawal",
+					"style": {
+						"navigationBarTitleText": "提现"
+					}
+				},
 				{
 					"path": "wallet",
 					"style": {
@@ -331,18 +343,6 @@
 
 					}
 				},
-				{
-					"path": "account",
-					"style": {
-						"navigationBarTitleText": "提现账号"
-					}
-				},
-				{
-					"path": "withdrawal",
-					"style": {
-						"navigationBarTitleText": "提现"
-					}
-				},
 				{
 					"path": "recharge",
 					"style": {

pages/cart/cart.vue

@@ -4,7 +4,7 @@
 			<view v-for="(item, index) in navList" :key="index" class="nav-item" @click="navChoose(index)" :class="{ navC: index == navIc }">{{ item.text }}</view>
 		</view>
 		<!-- 订单列表 -->
-		<swiper :current="navIc" class="swiper-box" duration="300" @change="changeTab">
+		<swiper :current="navIc" class="swiper-box" duration="300" @change="changeTab" :style="{ height: maxheight }">
 			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
 				<scroll-view scroll-y="true" class="scroll-y">
 					<view class="order-item" @click="goToOrderDetail(i)" v-for="i in tabItem.orderList" :key="i.id">
@@ -31,7 +31,7 @@
 							<view class="i-bottom">
 								共计{{ i.total_num }}件商品
 								<text>合计 ￥{{ i.pay_price }}</text>
-								( {{ i.pay_postage * 1 + i.pay_postage_sh * 1 > 0 ? '含物流费用￥' + (i.pay_postage * 1 + i.pay_postage_sh * 1) + '，' : '免邮，' }} 不含押金)
+								( {{ i.pay_postage * 1 > 0 ? '含物流费用￥' + i.pay_postage * 1 : '免邮' }})
 							</view>
 						</view>
 						<view class="btn-box" v-if="tabItem.state == 0">
@@ -39,8 +39,8 @@
 							<view class="btn" @click.stop="ljzf(i)">立即支付</view>
 						</view>
 						<view class="btn-box" v-if="tabItem.state == 1">
-							<view class="btn" @click.stop="sqth(i)" v-if="i.store_id != 0">申请退款</view>
-							<view class="btn" @click.stop="sqth(i)" v-if="i.store_id == 0 && i.gift_uid == 0">申请退款</view>
+							<view class="btn" @click.stop="sqth(i)" v-if="i.store_id != 0 && !i.is_virtual">申请退款</view>
+							<view class="btn" @click.stop="sqth(i)" v-if="i.store_id == 0 && i.gift_uid == 0 && !i.is_virtual">申请退款</view>
 							<view v-if="i.shipping_type == 2">
 								<view class="btn" @click.stop="showCode(i)" v-if="i.gift_uid == 0 || i.gift_uid == userInfo.uid">查看券码</view>
 							</view>
@@ -66,8 +66,23 @@ export default {
 	computed: {
 		...mapState('user', ['userInfo'])
 	},
+	onReady(res) {
+		var _this = this;
+		uni.getSystemInfo({
+			success: resu => {
+				const query = uni.createSelectorQuery();
+				query.select('.swiper-box').boundingClientRect();
+				query.exec(function(res) {
+					_this.maxheight = resu.windowHeight - res[0].top + 'px';
+					console.log('打印页面的剩余高度', _this.height);
+				});
+			},
+			fail: res => {}
+		});
+	},
 	data() {
 		return {
+			maxheight: '',
 			navIc: 0,
 			navList: [
 				{
@@ -101,6 +116,22 @@ export default {
 					orderList: [],
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
+				},
+				{
+					state: -1,
+					text: '退款中',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
+				},
+				{
+					state: -2,
+					text: '已退款',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
 				}
 			]
 		};
@@ -138,6 +169,22 @@ export default {
 				orderList: [],
 				page: 1, //当前页数
 				limit: 10 //每次信息条数
+			},
+			{
+				state: -1,
+				text: '退款中',
+				loadingType: 'more',
+				orderList: [],
+				page: 1, //当前页数
+				limit: 10 //每次信息条数
+			},
+			{
+				state: -2,
+				text: '已退款',
+				loadingType: 'more',
+				orderList: [],
+				page: 1, //当前页数
+				limit: 10 //每次信息条数
 			}
 		];
 		this.loadData();
@@ -324,14 +371,15 @@ export default {
 
 <style lang="scss" scoped>
 page {
-	height: 100%;
-
+	min-height: 100%;
+	height: auto;
 	background: #f8f1f2;
 }
 
 .container {
 	width: 100%;
-	height: 100%;
+	min-height: 100%;
+	height: auto;
 	position: fixed;
 
 	.navbar {
@@ -360,10 +408,9 @@ page {
 		}
 	}
 
-	.swiper-box,
 	.tab-content,
 	.scroll-y {
-		height: calc(100vh - 44px);
+		height: 100%;
 	}
 
 	.order-item {
@@ -385,12 +432,12 @@ page {
 			margin-left: 10rpx;
 			width: 144rpx;
 			height: 55rpx;
-			border: 1px solid #901b21;
+			border: 1px solid #ee2f72;
 			border-radius: 28rpx;
 			font-size: 26rpx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #901b21;
+			color: #ee2f72;
 			line-height: 55rpx;
 			text-align: center;
 		}
@@ -476,7 +523,7 @@ page {
 			position: relative;
 
 			b {
-				color: #901b21;
+				color: #ee2f72;
 				font-size: 35rpx;
 			}
 

pages/index/Vipgift.vue

@@ -1,24 +1,18 @@
 <template>
 	<view class="content padding-t-20">
-		<view class="flex item padding-v-20 padding-c-20" v-for="(item,index) in goodsList">
-			<view class="imgbox">
-				<image class="img" :src="item.image" mode="scaleToFill"></image>
-			</view>
+		<view class="flex item padding-v-20 padding-c-20" v-for="(item, index) in goodsList">
+			<view class="imgbox"><image class="img" :src="item.image" mode="scaleToFill"></image></view>
 			<view class="contentbox padding-l-20 flex">
-				<view class="clamp2 title">
-					{{item.store_name}}
-				</view>
+				<view class="clamp2 title">{{ item.store_name }}</view>
 				<view class="oldMoneyBox ">
-					<view class="flex-start padding-b-10">
-						<text class="oldMoney">￥{{item.price}}</text>
+					<!-- <view class="flex-start padding-b-10">
+						<text class="oldMoney">￥{{ item.ot_price }}</text>
 						<image class="icon padding-l-10" src="../../static/img/domIcon.png" mode="scaleToFill"></image>
-						<text class="domMoney font-size-sm">
-							直降{{item.sales}}元
-						</text>
-					</view>
+						<text class="domMoney font-size-sm">直降{{ item.ot_price * 1 - item.price * 1 }}元</text>
+					</view> -->
 					<view class="flex">
-						<view class="money">￥{{item.price}}</view>
-						<view class="buttomPay" @click="navto('/')">立即购买</view>
+						<view class="money">￥{{ item.price }}</view>
+						<view class="buttomPay" @click="navto('/pages/product/product?id=' + item.id)">立即购买</view>
 					</view>
 				</view>
 			</view>
@@ -28,152 +22,147 @@
 </template>
 
 <script>
-	import {
-		getProducts
-	} from '@/api/product.js';
-	export default {
-		data() {
-			return {
-				// 列表
-				goodsList: [],
-				limit: 6, //每次加载数据条数
-				page: 1, //当前页数
-				loadingType: 'more', //加载更多状态
-
-
-			};
-		},
-		onLoad() {
-			this.getProducts();
-		},
-		onShow() {},
-		onPullDownRefresh() {
-			this.getProducts('refresh');
+import { groomList } from '@/api/product.js';
+export default {
+	data() {
+		return {
+			// 列表
+			goodsList: [],
+			limit: 10, //每次加载数据条数
+			page: 1, //当前页数
+			loadingType: 'more' //加载更多状态
+		};
+	},
+	onLoad() {
+		this.getProducts();
+	},
+	onShow() {},
+	onPullDownRefresh() {
+		this.getProducts('refresh');
+	},
+	methods: {
+		navto(url) {
+			// #ifdef H5
+			console.log(url.indexOf('http'), 'banner');
+			if (url.indexOf('http') >= 0) {
+				window.location.href = url;
+			}
+			// #endif
+			//测试数据没有写id，用title代替
+			uni.navigateTo({
+				url: url
+			});
 		},
-		methods: {
-			navto(url) {
-				// #ifdef H5
-				console.log(url.indexOf('http'), 'banner');
-				if (url.indexOf('http') >= 0) {
-					window.location.href = url;
+		async getProducts(type) {
+			let obj = this;
+			// 判断是否为重新加载数据
+			if (type !== 'refresh') {
+				//没有更多数据直接跳出方法
+				if (obj.loadingType === 'nomore') {
+					return;
 				}
-				// #endif
-				//测试数据没有写id，用title代替
-				uni.navigateTo({
-					url: url
-				});
-			},
-			async getProducts(type) {
-				let obj = this;
-				// 判断是否为重新加载数据
-				if (type !== 'refresh') {
-					//没有更多数据直接跳出方法
-					if (obj.loadingType === 'nomore') {
-						return;
-					}
-					if (obj.loadingType === 'loading') {
-						//防止重复加载
-						return;
-					}
-					// 设置当前为数据载入中
-					obj.loadingType = 'loading';
-				} else {
-					this.page = 1;
-					obj.goodsList = [];
-					//当重新加载数据时更新状态为可继续添加数据
+				if (obj.loadingType === 'loading') {
+					//防止重复加载
+					return;
+				}
+				// 设置当前为数据载入中
+				obj.loadingType = 'loading';
+			} else {
+				this.page = 1;
+				obj.goodsList = [];
+				//当重新加载数据时更新状态为可继续添加数据
+				obj.loadingType = 'more';
+			}
+			let data = {
+				page: obj.page,
+				limit: obj.limit
+			};
+			groomList(data, 5).then(e => {
+				obj.goodsList = obj.goodsList.concat(e.data.list);
+				//判断是否还有下一页，有是more  没有是nomore
+				if (obj.limit == e.data.list.length) {
+					obj.page++;
 					obj.loadingType = 'more';
+				} else {
+					obj.loadingType = 'nomore';
 				}
-				let data = {
-					page: obj.page,
-					limit: obj.limit,
-				};
-				getProducts(data).then(e => {
-					obj.goodsList = obj.goodsList.concat(e.data);
-					//判断是否还有下一页，有是more  没有是nomore
-					if (obj.limit == e.data.length) {
-						obj.page++;
-						obj.loadingType = 'more';
-					} else {
-						obj.loadingType = 'nomore';
-					}
-				});
-			},
-
+			});
 		}
-	};
+	}
+};
 </script>
 
 <style lang="scss">
-	page,
-	.content {
-		min-height: 100%;
-		height: auto;
-	}
+page,
+.content {
+	min-height: 100%;
+	height: auto;
+}
 
-	.item {
-		border-radius: 10rpx;
-		background-color: #FFFFFF;
-		width: 690rpx;
-		margin: 0 30rpx 20rpx 30rpx;
-		align-items: stretch;
-		line-height: 1;
+.item {
+	border-radius: 10rpx;
+	background-color: #ffffff;
+	width: 690rpx;
+	margin: 0 30rpx 20rpx 30rpx;
+	align-items: stretch;
+	line-height: 1;
 
-		.imgbox {
-			line-height: 0;
-			background-color: #EE2F72;
-			border-radius: 10rpx;
-			overflow: hidden;
-			flex-shrink: 0;
-			.img {
-				height: 246rpx;
-				width: 246rpx;
-			}
+	.imgbox {
+		line-height: 0;
+		background-color: #ee2f72;
+		border-radius: 10rpx;
+		overflow: hidden;
+		flex-shrink: 0;
+		.img {
+			height: 246rpx;
+			width: 246rpx;
 		}
+	}
 
-		.contentbox {
-			flex-wrap: wrap;
+	.contentbox {
+		flex-wrap: wrap;
 
-			.title {
-				width: 100%;
-				align-self: flex-start;
-				font-size: $font-lg;
-				color: $font-color-dark;
-				line-height: 1.5;
-			}
+		.title {
+			width: 100%;
+			align-self: flex-start;
+			font-size: $font-lg;
+			color: $font-color-dark;
+			line-height: 1.5;
+		}
 
-			.money {
-				font-size: $font-lg + 4rpx;
-				font-weight: bold;
-				color: #EE2F72;
-			}
+		.money {
+			font-size: $font-lg + 4rpx;
+			font-weight: bold;
+			color: #ee2f72;
+		}
 
-			.oldMoneyBox {
-				align-self: flex-end;
-				width: 100%;
+		.oldMoneyBox {
+			align-self: flex-end;
+			width: 100%;
 
-				.oldMoney {
-					font-size: $font-sm;
-					text-decoration: line-through;
-					color: $font-color-light;
-				}
+			.oldMoney {
+				font-size: $font-sm;
+				text-decoration: line-through;
+				color: $font-color-light;
+			}
 
-				.domMoney {
-					color: #B59467;
-				}
+			.domMoney {
+				color: #b59467;
+			}
 
-				.icon {
-					width: 14rpx;
-					height: 16rpx;
-				}
+			.icon {
+				width: 14rpx;
+				height: 16rpx;
+			}
 
-				.buttomPay {
-					padding: 14rpx 26rpx;
-					font-size: $font-base;
-					color: #fff;
-					background: linear-gradient(90deg, #FF4A8A, #FF77A7);
-					border-radius: 26px;
-				}
+			.buttomPay {
+				padding: 14rpx 26rpx;
+				font-size: $font-base;
+				color: #fff;
+				background: linear-gradient(90deg, #ff4a8a, #ff77a7);
+				border-radius: 26px;
 			}
 		}
 	}
+}
 </style>

pages/index/index.vue

@@ -9,20 +9,20 @@
 		<!-- 轮播图 end -->
 		<view class="user-section">
 			<view class="user-info-box">
-				<view class="detail" @click="navTo('/pages/set/userinfo')">
+				<view class="detail" @click="navTo('/pages/set/set')">
 					<view class="portrait-box"><image class="portrait" :src="userInfo.avatar || '/static/error/missing-face.png'"></image></view>
 					<view class="info-box">
 						<view class="username">{{ userInfo.nickname || '游客' }}</view>
 						<view class="font-size-sm">升级会员享收益</view>
 					</view>
 				</view>
-				<view class="config text-white ">某娘粉丝</view>
+				<view class="config text-white">{{ userInfo.is_promoter == 0 ? '某娘粉丝' : 'VIP会员' }}</view>
 			</view>
 			<view class="upVipBox flex margin-t-20" @click="navto(item.url)">
 				<image class="upViewTip" src="../../static/img/indexUpVipIcon.png" mode="scaleToFill"></image>
 				<view class="flex-grow-true padding-c-10 flex" @click="navto('/pages/index/Vipgift')">
 					<view>
-						<view class="font-size-base text-default">购买会员礼包成为会员</view>
+						<view class="font-size-base text-default">会员俱乐部</view>
 						<view class="font-size-sm text-gray">每月赠送积分,下单抵扣当钱花</view>
 					</view>
 					<view class="font-size-sm">

pages/menu/menu.vue

@@ -23,10 +23,10 @@
 					<view class="t-b">距离你{{ checkedStore.distance | distance }}</view>
 				</view>
 			</view>
-			<view class="address-right">
+			<!-- <view class="address-right">
 				<view :class="{ isChoose: !isTakeaway }" class="bottom" @click="change">自提</view>
 				<view :class="{ isChoose: isTakeaway }" class="bottom" @click="change">外送</view>
-			</view>
+			</view> -->
 		</view>
 		<view class="memu">
 			<!-- 左侧 -->

pages/money/account.vue

@@ -1,289 +0,0 @@
-<template>
-	<view class="content">
-		<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" class="swiper-box" duration="300" @change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<view class="row b-b">
-					<text class="tit">姓名</text>
-					<input class="input" v-model="tabItem.orderList.name" type="text" placeholder="提款人姓名" placeholder-class="placeholder" />
-				</view>
-				<view class="row b-b">
-					<text class="tit">{{ tabIndex == 0 ? '账号' : '银行卡号' }}</text>
-					<input class="input" v-model="tabItem.orderList.code" type="text" placeholder="请输入账号" placeholder-class="placeholder" />
-				</view>
-				<view class="row b-b" v-if="tabIndex == 1">
-					<text class="tit">所属银行</text>
-					<input class="input" v-model="tabItem.orderList.bankName" type="text" placeholder="请输入账号" placeholder-class="placeholder" />
-				</view>
-			</swiper-item>
-		</swiper>
-
-		<button class="add-btn up" @click="confirm">提交申请</button>
-	</view>
-</template>
-
-<script>
-import { aliInfo, bankInfo, setAliInfo, setBankInfo } from '@/api/wallet.js';
-export default {
-	data() {
-		return {
-			tabCurrentIndex: 0,
-			navList: [
-				{
-					state: 0,
-					text: '支付宝',
-					loadingType: 'more',
-					orderList: {
-						name: '',
-						code: '',
-						id: ''
-					}
-				},
-				{
-					state: 1,
-					text: '银行卡',
-					loadingType: 'more',
-					orderList: {
-						name: '',
-						code: '',
-						bankName: '',
-						id: ''
-					}
-				}
-			]
-		};
-	},
-
-	onLoad(options) {
-		this.tabCurrentIndex = +options.state || 0;
-		// this.loadAli();
-		// this.loadBank();
-	},
-
-	methods: {
-		//加载数据
-		loadAli(source) {
-			aliInfo({}).then(({ data }) => {
-				let order = this.navList[0].orderList;
-				this.$set(order, 'name', data.fullname);
-				this.$set(order, 'code', data.alino);
-				this.$set(order, 'id', data.id);
-			});
-		},
-		loadBank() {
-			bankInfo({}).then(({ data }) => {
-				let order = this.navList[1].orderList;
-				this.$set(order, 'name', data.fullname);
-				this.$set(order, 'code', data.bankno);
-				this.$set(order, 'bankName', data.bank);
-				this.$set(order, 'id', data.id);
-			});
-		},
-		//swiper 切换
-		changeTab(e) {
-			this.tabCurrentIndex = e.target.current;
-		},
-		//顶部tab点击
-		tabClick(index) {
-			this.tabCurrentIndex = index;
-		},
-		// 提交保存
-		confirm() {
-			let obj = this;
-			let arr = obj.navList[obj.tabCurrentIndex].orderList;
-			let pages = getCurrentPages(); //获取所有页面栈实例列表
-			console.log(pages);
-			let nowPage = pages[pages.length - 1]; //当前页页面实例
-			let prevPage = pages[pages.length - 2]; //上一页页面实例
-			console.log(prevPage);
-			// prevPage.$vm.sh = 100;   //修改上一页data里面的sh参数值为100
-			if (obj.tabCurrentIndex == 1) {
-				if (!arr.name) {
-					return this.$api.msg('请输入提款人姓名');
-				}
-				if (!arr.bankName) {
-					return this.$api.msg('请输入所属银行');
-				}
-				if (!arr.code) {
-					return this.$api.msg('请输入银行卡号');
-				}
-				let data = {
-					fullname: arr.name,
-					bank: arr.bankName,
-					bankno: arr.code
-				};
-				// #ifdef H5
-				prevPage.$vm.bankData = data;
-				// #endif
-				// #ifdef MP
-				prevPage.setData({
-					bankData: data
-				});
-				// #endif
-				// obj.setBankInfo({
-				// 	fullname: arr.name,
-				// 	bank: arr.bankName,
-				// 	bankno: arr.code,
-				// 	id:arr.id
-				// });
-				uni.navigateBack({
-					delta: 1
-				});
-			}
-			if (obj.tabCurrentIndex == 0) {
-				if (!arr.name) {
-					return this.$api.msg('请输入提款人姓名');
-				}
-				if (!arr.code) {
-					return this.$api.msg('请输入支付宝账号');
-				}
-				let data = {
-					fullname: arr.name,
-					alino: arr.code
-				};
-				// #ifdef H5
-				prevPage.$vm.aliData = data;
-				// #endif
-
-				// #ifdef MP
-				prevPage.setData({
-					bankData: data
-				});
-				// #endif
-				// obj.setAliInfo({
-				// 	fullname: arr.name,
-				// 	alino: arr.code,
-				// 	id:arr.id
-				// });
-				uni.navigateBack({
-					delta: 1
-				});
-			}
-		},
-		/* 保存银行卡详细 */
-		setBankInfo(obj) {
-			setBankInfo(obj)
-				.then(e => {
-					uni.showToast({
-						title: '修改成功',
-						duration: 2000,
-						position: 'top'
-					});
-					this.$api.prePage().dataUp();
-					setTimeout(() => {
-						uni.navigateBack();
-					}, 1500);
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
-		// 修改支付宝信息
-		setAliInfo(obj) {
-			setAliInfo(obj)
-				.then(e => {
-					uni.showToast({
-						title: '修改成功',
-						duration: 2000,
-						position: 'top'
-					});
-					this.$api.prePage().dataUp();
-					setTimeout(() => {
-						uni.navigateBack();
-					}, 1500);
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.row {
-	display: flex;
-	align-items: center;
-	position: relative;
-	padding: 0 30rpx;
-	height: 110rpx;
-	background: #fff;
-	.tit {
-		flex-shrink: 0;
-		width: 120rpx;
-		font-size: 30rpx;
-		color: $font-color-dark;
-	}
-	.input {
-		flex: 1;
-		font-size: 30rpx;
-		color: $font-color-dark;
-	}
-	.iconlocation {
-		font-size: 36rpx;
-		color: $font-color-light;
-	}
-}
-page,
-.content {
-	background: $page-color-base;
-	height: 100%;
-}
-
-.swiper-box {
-	height: 750rpx;
-}
-
-.navbar {
-	display: flex;
-	height: 40px;
-	padding: 0 5px;
-	background: #fff;
-	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
-	position: relative;
-	z-index: 10;
-	.nav-item {
-		flex: 1;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		height: 100%;
-		font-size: 15px;
-		color: $font-color-dark;
-		position: relative;
-		&.current {
-			color: $base-color;
-			&:after {
-				content: '';
-				position: absolute;
-				left: 50%;
-				bottom: 0;
-				transform: translateX(-50%);
-				width: 44px;
-				height: 0;
-				border-bottom: 2px solid $base-color;
-			}
-		}
-	}
-}
-
-.add-btn {
-	&.up {
-		background-color: $base-color;
-		color: #fff;
-	}
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	width: 690rpx;
-	height: 80rpx;
-	margin: 0 auto;
-	margin-top: 30rpx;
-	font-size: $font-lg;
-	border-radius: 10rpx;
-	// box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
-}
-</style>

pages/money/pay.vue

@@ -178,6 +178,7 @@ export default {
 						// #endif
 						// #ifdef MP-WEIXIN
 						if (obj.payName == 'weixin') {
+							console.log(obj.money, '123465');
 							if (obj.money * 1 == 0) {
 								obj.paySuccessTo();
 							} else {
@@ -253,7 +254,7 @@ export default {
 		paySuccessTo() {
 			uni.hideLoading();
 			uni.redirectTo({
-				url: '/pages/money/paySuccess?orderid=' + this.orderId
+				url: '/pages/money/paySuccess?mun=' + this.money
 			});
 		},
 		//确认支付
@@ -340,6 +341,7 @@ export default {
 					}
 					// 保存订单号
 					obj.orderId = data.result.orderId;
+					console.log(obj.payName == 'weixin' && obj.money * 1 == 0, obj.payName, obj.money);
 					// 判断是否为余额支付
 					if (obj.payName == 'yue') {
 						if (status == 200) {
@@ -347,6 +349,12 @@ export default {
 						} else {
 							obj.$api.msg(msg);
 						}
+					} else if (obj.payName == 'weixin' && obj.money * 1 == 0) {
+						if (status == 200) {
+							obj.paySuccessTo();
+						} else {
+							obj.$api.msg(msg);
+						}
 					} else {
 						// 立即支付
 						obj.orderMoneyPay();

pages/money/paySuccess.vue

@@ -111,7 +111,7 @@
 			background: #FFFFFF;
 			border: 2px solid #ee2f72;
 			border-radius: 10rpx;
-			color: #901b21;
+			color: #ee2f72;
 		}
 	}
 </style>

pages/money/wallet.vue

@@ -1,335 +1,447 @@
-<template>
-	<view class="content">
-		<view class="top-bg">
-
-		</view>
-		<view class="yue-wrap flex">
-			<view class="yue-tit">
-				总资产(CNY)
-			</view>
-			<view class="yue-num flex">
-				<view class="yue">
-					{{userInfo.now_money || '0.00'}}
-				</view>
-				<view class="cz" @click="navto('/pages/money/recharge')">
-					充值
-					<image src="../../static/icon/dz.png" mode="widthFix"></image>
-				</view>
-			</view>
-			<view class="lj-wrap flex">
-				<view class="">
-					累计消费：￥{{ userInfo.orderStatusSum || '0'}}
-				</view>
-				<view class="">
-					累计充值：￥{{ userInfo.recharge || '0' }}
-				</view>
-			</view>
-		</view>
-		<scroll-view scroll-y="true" class="jl-wrap" :style="{'height': maxheight}" @scrolltolower="loadData">
-			<view>
-				<empty v-if="navList[tabCurrentIndex].orderList.length == 0 && navList[tabCurrentIndex].loaded"></empty>
-				<view class="jl " v-for="item in navList[tabCurrentIndex].orderList">
-					<view class="jl-tit flex">
-						<view class="clamp2 tit">
-							{{item.title}}
-						</view>
-						<view class="price" :class="{'add':item.pm == 1,'jian': item.pm == 0}">
-							{{item.number*1}}
-						</view>
-					</view>
-					<view class="jl-mark flex">
-						<!-- <view class="mark">
-							{{item.mark}}
-						</view> -->
-						<view class="">
-							{{item.add_time}}
-						</view>
-					</view>
-				</view>
-				<uni-load-more :status="navList[tabCurrentIndex].loadingType"></uni-load-more>
-			</view>
-		</scroll-view>
-	</view>
-</template>
-
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	import {
-		spreadCommission,
-		userBalance
-	} from '@/api/wallet.js';
-	import {
-		getMoneyStyle
-	} from '@/utils/rocessor.js';
-	import {
-		getUserInfo,
-		getUser
-	} from '@/api/user.js';
-	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-	import empty from '@/components/empty';
-	export default {
-		filters: {
-			getMoneyStyle
-		},
-		components: {
-			empty,
-			uniLoadMore
-		},
-		onReady() {
-			// 初始化获取页面宽度
-			var obj = this;
-			uni.getSystemInfo({
-				success: resu => {
-					const query = uni.createSelectorQuery();
-					query.select('.jl-wrap').boundingClientRect();
-					query.exec(function(res) {
-						obj.maxheight = resu.windowHeight - res[0].top + 'px';
-					});
-				},
-				fail: res => {}
-			});
-		},
-		data() {
-			return {
-				// 头部图高度
-				maxheight: '',
-				tabCurrentIndex: 0,
-				navList: [{
-						state: 0,
-						text: '收入',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10, //每次信息条数
-						loaded: false
-					}, {
-						state: 2,
-						text: '收入',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10, //每次信息条数
-						loaded: false
-					},
-					{
-						state: 1,
-						text: '支出',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10, //每次信息条数
-						loaded: false
-					},
-
-				],
-				money: '',
-				userInfo: {}
-			};
-		},
-		onLoad(options) {},
-		onShow() {
-			this.loadData();
-			this.getUserInfo()
-		},
-		methods: {
-			...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
-			getUserInfo() {
-				getUser({}).then(({ data }) => {
-					this.userInfo = data
-				});
-			},
-			// 页面跳转
-			navto(e) {
-				uni.navigateTo({
-					url: e
-				});
-			},
-			//获取收入支出信息
-			async loadData(source) {
-				//这里是将订单挂载到tab列表下
-				let index = this.tabCurrentIndex;
-				let navItem = this.navList[index];
-				let state = navItem.state;
-				if (source === 'tabChange' && navItem.loaded === true) {
-					//tab切换只有第一次需要加载数据
-					return;
-				}
-				if (navItem.loadingType === 'loading') {
-					//防止重复加载
-					return;
-				}
-				// 修改当前对象状态为加载中
-				navItem.loadingType = 'loading';
-
-				spreadCommission({
-							page: navItem.page,
-							limit: navItem.limit
-						},
-						state
-					)
-					.then(({
-						data
-					}) => {
-						console.log(data, '获取数据');
-						// if (data.count > 0) {
-						// 	navItem.orderList = navItem.orderList.concat(data.list);
-						// 	console.log(navItem.orderList);
-						// 	navItem.page++;
-						// }
-						if (data.length > 0) {
-							data.forEach(item => {
-								console.log(item.list, '内部列表')
-								navItem.orderList = navItem.orderList.concat(item.list)
-							})
-							// navItem.orderList = navItem.orderList.concat(data[0].list);
-							console.log(navItem.orderList);
-							navItem.page++;
-						}
-						if (navItem.limit == data.length) {
-							//判断是否还有数据， 有改为 more， 没有改为noMore
-							navItem.loadingType = 'more';
-							return;
-						} else {
-							//判断是否还有数据， 有改为 more， 没有改为noMore
-							navItem.loadingType = 'noMore';
-						}
-						uni.hideLoading();
-						this.$set(navItem, 'loaded', true);
-
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			},
-
-			//swiper 切换
-			changeTab(e) {
-				this.tabCurrentIndex = e.target.current;
-				this.loadData('tabChange');
-			},
-			//顶部tab点击
-			tabClick(index) {
-				this.tabCurrentIndex = index;
-			},
-			addmoney() {
-				uni.navigateTo({
-					url: '/pages/money/recharge'
-				})
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	page {
-		background-color: #fff;
-		height: auto;
-		min-height: 100%;
-	}
-
-	.top-bg {
-		background-color: #ee2f72;
-		height: 180rpx;
-		width: 750rpx;
-	}
-
-	.yue-wrap {
-		width: 670rpx;
-		height: 320rpx;
-		margin: -160rpx auto 30rpx;
-		background: linear-gradient(-70deg, #FF77A7, #FF4A8A);
-		box-shadow: 0px 15rpx 22rpx 6rpx rgba(238, 47, 114, 0.1);
-		border-radius: 25rpx;
-		color: #fff;
-		font-size: 26rpx;
-		padding: 50rpx 75rpx;
-		flex-direction: column;
-		justify-content: space-between;
-		align-items: flex-start;
-
-		.yue-num {
-			width: 100%;
-			justify-content: space-between;
-
-			.yue {
-				font-size: 76rpx;
-				font-weight: bold;
-			}
-
-			.cz {
-				image {
-					width: 13rpx;
-					margin-left: 10rpx;
-				}
-			}
-		}
-
-		.lj-wrap {
-			width: 100%;
-			justify-content: space-between;
-			font-size: 24rpx;
-		}
-	}
-
-	.jl {
-		width: 670rpx;
-		margin: 0 auto 20rpx;
-		padding: 35rpx 30rpx;
-		background: #FFFFFF;
-		box-shadow: 0px 0px 28px 0px rgba(48, 48, 48, 0.1);
-		border-radius: 8px;
-
-		.jl-tit {
-			width: 100%;
-			font-size: 28rpx;
-			font-weight: bold;
-			color: #333333;
-
-			.tit {
-				max-width: 450rpx;
-			}
-
-			.price {
-				font-size: 38rpx;
-				font-weight: bold;
-
-			}
-
-			.add {
-				color: #EE2F72;
-
-				&::before {
-					content: '+';
-					font-size: 28rpx;
-					color: #EE2F72;
-				}
-			}
-
-			.jian {
-				color: #808080;
-
-				&::before {
-					content: '-';
-					font-size: 28rpx;
-				}
-			}
-		}
-
-		.jl-mark {
-			padding-top: 20rpx;
-			width: 100%;
-			font-size: 24rpx;
-			font-weight: 500;
-			color: #808080;
-			align-items: flex-start;
-
-			// justify-content: flex-end;
-			.mark {
-				max-width: 470rpx;
-			}
-		}
+<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="yue-left">
+					<view class="cz" @click="open()">
+						发红包
+						<image src="../../static/icon/dz.png" mode="widthFix"></image>
+					</view>
+				</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 class="tx" @click="navto('/pages/money/withdrawal')">
+						提现
+						<image src="../../static/icon/dz.png" mode="widthFix"></image>
+					</view>
+				</view>
+			</view>
+			<view class="lj-wrap flex">
+				<view class="">累计消费：￥{{ userInfo.orderStatusSum || '0' }}</view>
+				<view class="">累计充值：￥{{ userInfo.recharge || '0' }}</view>
+			</view>
+		</view>
+		<scroll-view scroll-y="true" class="jl-wrap" :style="{ height: maxheight }" @scrolltolower="loadData">
+			<view>
+				<empty v-if="navList[tabCurrentIndex].orderList.length == 0 && navList[tabCurrentIndex].loaded"></empty>
+				<view class="jl " v-for="item in navList[tabCurrentIndex].orderList">
+					<view class="jl-tit flex">
+						<view class="clamp2 tit">{{ item.title }}</view>
+						<view class="price" :class="{ add: item.pm == 1, jian: item.pm == 0 }">{{ item.number * 1 }}</view>
+					</view>
+					<view class="jl-mark flex">
+						<!-- <view class="mark">
+							{{item.mark}}
+						</view> -->
+						<view class="" v-if="item.status == 1">{{ item.add_time }}</view>
+						<view class="" v-if="item.status == 0">等待下级确认收货</view>
+					</view>
+				</view>
+				<uni-load-more :status="navList[tabCurrentIndex].loadingType"></uni-load-more>
+			</view>
+		</scroll-view>
+		<uni-popup ref="popuphx" class="agree-wrapper">
+			<view class="hx-wrapper">
+				<view class="hx-img"><image src="../../static/img/hxbg.png" mode=""></image></view>
+				<view class="hx-body">
+					<view class="hx-title">输入红包金额</view>
+					<input type="text" v-model="num" placeholder="请输入红包金额" placeholder-class="hx-placeholder" />
+					<view class="hx-btn" @click="qhx">立即发送</view>
+				</view>
+				<view class="hx-close" @click="close"><image src="../../static/icon/close.png" mode=""></image></view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+import { mapState, mapMutations } from 'vuex';
+import { spreadCommission, userBalance } from '@/api/wallet.js';
+import { getMoneyStyle } from '@/utils/rocessor.js';
+import { getUserInfo, getUser, redbag } from '@/api/user.js';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import empty from '@/components/empty';
+export default {
+	filters: {
+		getMoneyStyle
+	},
+	components: {
+		empty,
+		uniLoadMore
+	},
+	onReady() {
+		// 初始化获取页面宽度
+		var obj = this;
+		uni.getSystemInfo({
+			success: resu => {
+				const query = uni.createSelectorQuery();
+				query.select('.jl-wrap').boundingClientRect();
+				query.exec(function(res) {
+					obj.maxheight = resu.windowHeight - res[0].top + 'px';
+				});
+			},
+			fail: res => {}
+		});
+	},
+	data() {
+		return {
+			// 头部图高度
+			maxheight: '',
+			tabCurrentIndex: 0,
+			num: '',
+			navList: [
+				{
+					state: 0,
+					text: '收入',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10, //每次信息条数
+					loaded: false
+				},
+				{
+					state: 2,
+					text: '收入',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10, //每次信息条数
+					loaded: false
+				},
+				{
+					state: 1,
+					text: '支出',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10, //每次信息条数
+					loaded: false
+				}
+			],
+			money: '',
+			userInfo: {}
+		};
+	},
+	onLoad(options) {},
+	onShow() {
+		this.loadData();
+		this.getUserInfo();
+	},
+	methods: {
+		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
+		getUserInfo() {
+			getUser({}).then(({ data }) => {
+				this.userInfo = data;
+			});
+		},
+		// 页面跳转
+		navto(e) {
+			uni.navigateTo({
+				url: e
+			});
+		},
+		open() {
+			this.$refs.popuphx.open();
+		},
+		close() {
+			this.$refs.popuphx.close();
+		},
+		qhx() {
+			const obj = this;
+			redbag({ num: this.num }).then(e => {
+				console.log(e);
+				uni.navigateTo({
+					url:
+						'/pages/user/shareEx?shareid=' +
+						e.data.uni +
+						'&scene=' +
+						obj.userInfo.uid +
+						'&num=' +
+						obj.num +
+						'&logo=' +
+						obj.userInfo.avatar +
+						'&nickname=' +
+						obj.userInfo.nickname +
+						'&type=1'
+				});
+			});
+		},
+		//获取收入支出信息
+		async loadData(source) {
+			//这里是将订单挂载到tab列表下
+			let index = this.tabCurrentIndex;
+			let navItem = this.navList[index];
+			let state = navItem.state;
+			if (source === 'tabChange' && navItem.loaded === true) {
+				//tab切换只有第一次需要加载数据
+				return;
+			}
+			if (navItem.loadingType === 'loading') {
+				//防止重复加载
+				return;
+			}
+			// 修改当前对象状态为加载中
+			navItem.loadingType = 'loading';
+
+			spreadCommission(
+				{
+					page: navItem.page,
+					limit: navItem.limit
+				},
+				state
+			)
+				.then(({ data }) => {
+					console.log(data, '获取数据');
+					// if (data.count > 0) {
+					// 	navItem.orderList = navItem.orderList.concat(data.list);
+					// 	console.log(navItem.orderList);
+					// 	navItem.page++;
+					// }
+					if (data.length > 0) {
+						data.forEach(item => {
+							console.log(item.list, '内部列表');
+							navItem.orderList = navItem.orderList.concat(item.list);
+						});
+						// navItem.orderList = navItem.orderList.concat(data[0].list);
+						console.log(navItem.orderList);
+						navItem.page++;
+					}
+					if (navItem.limit == data.length) {
+						//判断是否还有数据， 有改为 more， 没有改为noMore
+						navItem.loadingType = 'more';
+						return;
+					} else {
+						//判断是否还有数据， 有改为 more， 没有改为noMore
+						navItem.loadingType = 'noMore';
+					}
+					uni.hideLoading();
+					this.$set(navItem, 'loaded', true);
+				})
+				.catch(e => {
+					console.log(e);
+				});
+		},
+
+		//swiper 切换
+		changeTab(e) {
+			this.tabCurrentIndex = e.target.current;
+			this.loadData('tabChange');
+		},
+		//顶部tab点击
+		tabClick(index) {
+			this.tabCurrentIndex = index;
+		},
+		addmoney() {
+			uni.navigateTo({
+				url: '/pages/money/recharge'
+			});
+		}
 	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background-color: #fff;
+	height: auto;
+	min-height: 100%;
+}
+
+.top-bg {
+	background-color: #ee2f72;
+	height: 180rpx;
+	width: 750rpx;
+}
+
+.yue-wrap {
+	width: 670rpx;
+	height: 320rpx;
+	margin: -160rpx auto 30rpx;
+	background: linear-gradient(-70deg, #ff77a7, #ff4a8a);
+	box-shadow: 0px 15rpx 22rpx 6rpx rgba(238, 47, 114, 0.1);
+	border-radius: 25rpx;
+	color: #fff;
+	font-size: 26rpx;
+	padding: 50rpx 75rpx;
+	flex-direction: column;
+	justify-content: space-between;
+	align-items: flex-start;
+	.yue-tit {
+		width: 100%;
+	}
+	.cz {
+		image {
+			width: 13rpx;
+			margin-left: 10rpx;
+		}
+	}
+	.tx {
+		image {
+			width: 13rpx;
+			margin-left: 10rpx;
+		}
+	}
+	.yue-num {
+		width: 100%;
+		justify-content: space-between;
+
+		.yue {
+			font-size: 76rpx;
+			font-weight: bold;
+		}
+
+		.cz {
+			image {
+				width: 13rpx;
+				margin-left: 10rpx;
+			}
+		}
+	}
+
+	.lj-wrap {
+		width: 100%;
+		justify-content: space-between;
+		font-size: 24rpx;
+	}
+}
+
+.jl {
+	width: 670rpx;
+	margin: 0 auto 20rpx;
+	padding: 35rpx 30rpx;
+	background: #ffffff;
+	box-shadow: 0px 0px 28px 0px rgba(48, 48, 48, 0.1);
+	border-radius: 8px;
+
+	.jl-tit {
+		width: 100%;
+		font-size: 28rpx;
+		font-weight: bold;
+		color: #333333;
+
+		.tit {
+			max-width: 450rpx;
+		}
+
+		.price {
+			font-size: 38rpx;
+			font-weight: bold;
+		}
+
+		.add {
+			color: #ee2f72;
+
+			&::before {
+				content: '+';
+				font-size: 28rpx;
+				color: #ee2f72;
+			}
+		}
+
+		.jian {
+			color: #808080;
+
+			&::before {
+				content: '-';
+				font-size: 28rpx;
+			}
+		}
+	}
+
+	.jl-mark {
+		padding-top: 20rpx;
+		width: 100%;
+		font-size: 24rpx;
+		font-weight: 500;
+		color: #808080;
+		align-items: flex-start;
+
+		// justify-content: flex-end;
+		.mark {
+			max-width: 470rpx;
+		}
+	}
+}
+.hx-wrapper {
+	width: 536rpx;
+	height: 630rpx;
+	position: relative;
+
+	// background-color: #fff;
+	.hx-img {
+		width: 536rpx;
+		height: 281rpx;
+
+		image {
+			width: 536rpx;
+			height: 281rpx;
+		}
+	}
+
+	.hx-close {
+		position: absolute;
+		left: 243rpx;
+		bottom: -80rpx;
+		width: 52rpx;
+		height: 52rpx;
+
+		image {
+			width: 52rpx;
+			height: 52rpx;
+		}
+	}
+
+	.hx-body {
+		width: 536rpx;
+		height: 349rpx;
+		background-color: #fff;
+		border-radius: 0 0 10rpx 10rpx;
+
+		.hx-title {
+			width: 536rpx;
+			font-size: 36rpx;
+			font-weight: 500;
+			color: #333333;
+			line-height: 1;
+			padding-top: 42rpx;
+			text-align: center;
+		}
+
+		input {
+			width: 439rpx;
+			height: 68rpx;
+			background: #eeddde;
+			border-radius: 10rpx;
+			margin: 39rpx auto 0;
+			padding-left: 26rpx;
+
+			.hx-placeholder {
+				font-size: 26rpx;
+				font-weight: 500;
+				color: #ee2f72;
+			}
+		}
+
+		.hx-btn {
+			margin: 44rpx auto 0;
+			width: 353rpx;
+			height: 71rpx;
+			background: #ee2f72;
+			border-radius: 34rpx;
+			font-size: 36rpx;
+			font-weight: 500;
+			color: #f8f9f9;
+			line-height: 71rpx;
+			text-align: center;
+		}
+	}
+}
 </style>

pages/money/withdrawal.vue

@@ -1,450 +1,305 @@
 <template>
-	<view class="content" v-if="!isUp">
-		<!-- <uni-notice-bar single="true" text="每月25号到月底可提现上月结算余额"></uni-notice-bar> -->
-		<!-- 		<view class="content-money">
+	<view class="content">
+		<view class="content-money">
 			<view class="flex ">
 				<view class="buttom">
-					<view class="text">可提现金额</view>
 					<view class="icon">{{ money | getMoneyStyle }}</view>
+					<text class="text">可提现金额</text>
 				</view>
-				<view class="interval"></view>
-				 <view class="buttom">
+				<!-- <view class="interval"></view>
+				<view class="buttom">
 					<view class=" icon">{{ freeze | getMoneyStyle }}</view>
 					<text class="text">待审核提现金额</text>
-				</view>
-			</view>
-		</view> -->
-		<view class="row-box">
-			<!-- <view class="title">提现金额</view> -->
-			<view class="could">
-				<text class="">
-					可提现金额
-				</text>
-				<text class="num">
-					￥{{ money | getMoneyStyle }}
-				</text>
+				</view> -->
 			</view>
-			<view class="jg"></view>
-			<view class="sq">
-				<text class="">
-					申请提现金额
-				</text>
-				<text class="num">
-					￥{{ withdrawal | getMoneyStyle }}
-				</text>
-			</view>
-			<view class="jg"></view>
-			<!-- <view class="row">
-				<text class="tit">￥</text>
-				<input class="input" type="number" v-model="withdrawal" :placeholder="'最低提现金额' + minPrice + '元'"
-					placeholder-class="placeholder" />
-				<view class="buttom" @click="withdrawal = money">全部提现</view>
-			</view> -->
 		</view>
-		<view class="row-box" style="margin-bottom: 20rpx;">
+		<view class="row-box">
 			<view class="title">提现金额</view>
 			<view class="row">
 				<text class="tit">￥</text>
-				<input class="input" type="number" v-model="withdrawal" placeholder="请输入提现金额"
-					placeholder-class="placeholder" />
+				<input class="input" type="number" v-model="withdrawal" :placeholder="'最低提现金额' + minPrice + '元'" placeholder-class="placeholder" />
 				<view class="buttom" @click="withdrawal = money">全部提现</view>
 			</view>
 		</view>
-		<view class="row b-b">
-			<text class="tit">姓名</text>
-			<input class="input" v-model="name" type="text" placeholder="提款人姓名" placeholder-class="placeholder" />
-		</view>
-		<view class="row b-b">
-			<text class="tit">银行卡号</text>
-			<input class="input" v-model="bankno" type="text" placeholder="请输入银行卡号" placeholder-class="placeholder" />
-		</view>
-		<view class="row b-b">
-			<text class="tit">所属银行</text>
-			<input class="input" v-model="bankname" type="text" placeholder="请输入所属银行" placeholder-class="placeholder" />
+		<!-- #ifndef MP-WEIXIN -->
+		<view class="list" v-if="!weichatBsrowser">
+			<radio-group @change="tabRadio">
+				<label>
+					<view class="box">
+						<view class="icon iconfont iconweixin1"></view>
+						<view class="title-box">
+							<view class="title"><text>提现至微信</text></view>
+						</view>
+						<view class="right"><radio value="weixin" color="#5dbc7c" :checked="type == 'weixin'" /></view>
+					</view>
+				</label>
+				<label>
+					<view class="box">
+						<view class="icon iconfont iconzhifubao"></view>
+						<view class="title-box">
+							<view class="title">
+								<text v-if="aliData.fullname">提现至支付宝</text>
+								<text v-else>请创建支付宝账号</text>
+							</view>
+							<view class="node">
+								<text v-if="aliData.fullname">真实姓名({{ aliData.fullname }})</text>
+							</view>
+						</view>
+						<view class="right"><radio value="alipay" color="#5dbc7c" :checked="type == 'alipay'" /></view>
+					</view>
+				</label>
+				<label>
+					<view class="box">
+						<view class="icon iconfont"><image class="icon-img" src="/static/icon/i8.png" mode="aspectFit"></image></view>
+						<view class="title-box">
+							<view class="title">
+								<text v-if="bankData.bankno">{{ bankData.bank + ' ' + bankData.bankno }}</text>
+								<text v-else>请创建银行账号</text>
+							</view>
+							<view class="node">
+								<text v-if="bankData.fullname">真实姓名({{ bankData.fullname }})</text>
+							</view>
+						</view>
+						<view class="right"><radio value="bank" color="#5dbc7c" :checked="type == 'bank'" /></view>
+					</view>
+				</label>
+			</radio-group>
 		</view>
+		<!-- #endif -->
 		<button class="add-btn up" @click="confirm">提交申请</button>
 	</view>
 </template>
 
 <script>
-	import {
+import { getMoneyStyle } from '@/utils/rocessor.js';
+import { extractCash, extractBank, aliInfo, bankInfo } from '@/api/wallet.js';
+export default {
+	filters: {
 		getMoneyStyle
-	} from '@/utils/rocessor.js';
-	import {
-		extractCash,
-		extractBank,
-		aliInfo,
-		bankInfo
-	} from '@/api/wallet.js';
-	import {
-		spreadInfo
-	} from '@/api/user.js'
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	export default {
-		filters: {
-			getMoneyStyle
+	},
+	data() {
+		return {
+			type: 'weixin', //提现方式
+			money: '0.00', //可提现金额
+			freeze: '0.0', //冻结金额
+			withdrawal: '', //提现金额
+			minPrice: '', //最少提现金额
+			aliData: {},
+			bankData: {},
+			// #ifdef H5
+			weichatBsrowser: false
+			// #endif
+		};
+	},
+	onLoad(options) {
+		// #ifdef H5
+		this.weichatBsrowser = uni.getStorageSync('weichatBrowser');
+		// #endif
+		//加载提现信息
+		this.loadData();
+		// 加载提款账号信息
+		this.loadAli();
+		this.loadBank();
+	},
+	methods: {
+		// 更新数据
+		dataUp() {
+			this.loadAli();
+			this.loadBank();
 		},
-		data() {
-			return {
-				name: '',
-				bankno: '',
-				bankname: '',
-				type: 'bank', //提现方式
-				money: '0.00', //可提现金额
-				freeze: '0.0', //冻结金额
-				withdrawal: '', //提现金额
-				minPrice: '', //最少提现金额
-				aliData: {},
-				bankData: {},
-				// #ifdef H5
-				weichatBsrowser: false
-				// #endif
-
-			};
+		//加载数据
+		async loadAli(source) {
+			aliInfo({}).then(e => {
+				this.aliData = e.data;
+			});
 		},
-		computed: {
-			...mapState(['isUp']),
+		// 加载银行卡信息
+		async loadBank() {
+			bankInfo({}).then(e => {
+				this.bankData = e.data;
+			});
 		},
-		onLoad(options) {
-			if (this.isUp) {
-				uni.switchTab({
-					url: '/pages/index/index'
-				})
-			}
-			// #ifdef H5
-			this.weichatBsrowser = uni.getStorageSync('weichatBrowser');
-			// #endif
-			//加载提现信息
-			this.loadData();
-			// 加载提款账号信息
-			// this.loadAli();
-			// this.loadBank();
+		// 加载余额信息
+		async loadData() {
+			extractBank({}).then(({ data }) => {
+				this.money = data.commissionCount; //可提现余额
+				this.minPrice = data.minPrice; //最小提现
+				this.freeze = data.inmoneyCount; //提现中的余额
+			});
 		},
-		methods: {
-			// 更新数据
-			dataUp() {
-				this.loadAli();
-				this.loadBank();
-			},
-			//加载数据
-			async loadAli(source) {
-				aliInfo({}).then(e => {
-					this.aliData = e.data;
-				});
-			},
-			// 加载银行卡信息
-			async loadBank() {
-				bankInfo({}).then(e => {
-					this.bankData = e.data;
-				});
-			},
-			// 加载余额信息
-			async loadData() {
-				// spreadInfo().then( ({data}) => {
-				// 	console.log(data,"spreadInfo++++++++++++++++++")
-				// 	this.money = data.brokerage_price//可提现余额
-				// 	this.minPrice = data.user_extract_min//最小提现
-				// 	this.freeze = data.lock_brokerage//冻结金额
-				// })
-				extractBank({}).then(({
-					data
-				}) => {
-					this.money = data.commissionCount; //可提现余额
-					this.minPrice = data.minPrice; //最小提现
-					if(data.lastExtract) {
-						this.name = data.lastExtract.real_name
-						this.bankno = data.lastExtract.bank_code
-						this.bankname = data.lastExtract.bank_address
-					}
-					// this.freeze =data.inmoneyCount//提现中的余额
-				});
-			},
-			// 跳转
-			navTo(url) {
-				uni.navigateTo({
-					url: url
-				});
-			},
-			// 切换选中对象
-			tabRadio(e) {
-				this.type = e.detail.value;
-			},
-			// 提交
-			confirm() {
-				console.log(this.withdrawal, this.money)
-				let obj = this
-				// if (+this.withdrawal == 0) {
-				// 	return this.$api.msg('请输入提现金额')
-				// }
-				// if (+this.withdrawal < +this.minPrice) {
-				// 	return this.$api.msg('提现金额不足最低提现金额')
-				// }
-				// if (+this.withdrawal > +this.money) {
-				// 	return this.$api.msg('可提现佣金不足')
-				// }
-				let data = {
-					extract_type: this.type, //bank -银行卡 alipay-支付宝 weixin-微信
-					money: this.withdrawal*1, //金额
-					money_type: 0 //0佣金1余额
-				}
-				data.name = obj.name
-				data.bankname = obj.bankname
-				data.cardnum = obj.bankno
-				// if (this.type == 'alipay') {
-				// 	data.name = this.aliData.fullname;
-				// 	data.alipay_code = this.aliData.alino;
-				// 	if (!data.name) {
-				// 		return this.$api.msg('请完善账户名称')
-				// 	}
-				// 	if (!data.alipay_code) {
-				// 		return this.$api.msg('请完善支付宝账号')
-				// 	}
-				// }
-				// if (this.type == 'bank') {
-				// 	data.name = this.bankData.fullname;
-				// 	data.bankname = this.bankData.bank;
-				// 	data.cardnum = this.bankData.bankno;
-				// 	if (!data.name) {
-				// 		return this.$api.msg('请完善银行卡信息')
-				// 	}
-				// 	if (!data.bankname) {
-				// 		return this.$api.msg('请完善银行卡信息')
-				// 	}
-				// 	if (!data.cardnum) {
-				// 		return this.$api.msg('请完善银行卡信息')
-				// 	}
-				// }
-				
+		// 跳转
+		navTo(url) {
+			uni.navigateTo({
+				url: url
+			});
+		},
+		// 切换选中对象
+		tabRadio(e) {
+			this.type = e.detail.value;
+		},
+		// 提交
+		confirm() {
+			let data = {
+				extract_type: this.type, //bank -银行卡 alipay-支付宝 weixin-微信
+				money: this.withdrawal, //金额
+				money_type: 1 //0佣金1余额
+			};
+			if (this.type == 'alipay') {
+				data.name = this.aliData.fullname;
+				data.alipay_code = this.aliData.alino;
+			}
+			if (this.type == 'bank') {
+				data.name = this.bankData.fullname;
+				data.bankname = this.bankData.bank;
+				data.cardnum = this.bankData.bankno;
+			}
 
-				extractCash(data)
-					.then(e => {
-						uni.showToast({
-							title: '提交成功',
-							duration: 2000,
-							position: 'top'
-						});
-						obj.money = '0.00' //可提现金额
-						obj.withdrawal = 0 //提现金额
-						this.loadData();
-					})
-					.catch(e => {
-						console.log();
+			extractCash(data)
+				.then(e => {
+					uni.showToast({
+						title: '提交成功',
+						duration: 2000,
+						position: 'top'
 					});
-			}
+				})
+				.catch(e => {
+					console.log();
+				});
 		}
-	};
+	}
+};
 </script>
 
 <style lang="scss">
-	page {
-		height: 100%;
-	}
-
-	.content-money {
-		padding: 30rpx 0;
-		background: #ffffff;
-	}
-
-	.flex {
-		background-color: #ffffff;
-		text-align: center;
-		margin: 0 30rpx;
-		border-radius: $border-radius-sm;
-		justify-content: space-between;
-		flex-direction: row;
-
-		.buttom {
-			font-size: $font-lg;
-			width: 50%;
-		}
-
-		.interval {
-			width: 2px;
-			height: 60rpx;
-			background-color: #eeeeee;
-		}
-
-		.icon {
-			background-size: 100%;
-			font-size: 42rpx;
-			color: $font-color-dark;
-			font-weight: bold;
-			background-repeat: no-repeat;
-			background-position: center;
-		}
-
-		.text {
-			color: $font-color-light;
-		}
-	}
-
-
-	.add-btn {
-		&.modified {
-			color: $base-color;
-		}
-
-		&.up {
-			background-color: $base-color;
-			color: #fff;
-		}
-
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		width: 690rpx;
-		height: 80rpx;
-		margin: 0 auto;
-		margin-top: 30rpx;
+page {
+	height: 100%;
+}
+.content-money {
+	padding: 30rpx 0;
+	background: #ffffff;
+}
+.flex {
+	background-color: #ffffff;
+	text-align: center;
+	margin: 0 30rpx;
+	border-radius: $border-radius-sm;
+	.buttom {
 		font-size: $font-lg;
-		border-radius: 10rpx;
-		// box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+		width: 100%;
 	}
-
-	.list {
-		padding-left: 30rpx;
-		margin-top: 30rpx;
-		background-color: #ffffff;
-
-		.box {
-			display: flex;
-			align-items: center;
-			width: 100%;
-			padding: 0 21rpx;
-			height: 120rpx;
-			border-bottom: 1px solid $border-color-light;
-
-			.icon {
-				font-size: 48rpx;
-				padding-right: 20rpx;
-
-				.icon-img {
-					height: 50rpx;
-					width: 50rpx;
-				}
-			}
-
-			.iconweixin1 {
-				color: #18bf16;
-			}
-
-			.iconzhifubao {
-				color: #08aaec;
-			}
-
-			.title-box {
-				flex-grow: 1;
-				text-align: left;
-
-				.title {
-					font-size: $font-base + 2rpx;
-					color: $font-color-base;
-				}
-
-				.node {
-					font-size: $font-sm;
-					color: $font-color-light;
-				}
-			}
-		}
+	.interval {
+		width: 2px;
+		height: 60rpx;
+		background-color: #eeeeee;
 	}
-
-	/deep/ .uni-radio-input {
-		width: 45rpx;
-		height: 45rpx;
+	.icon {
+		background-size: 100%;
+		font-size: 42rpx;
+		color: $font-color-dark;
+		font-weight: bold;
+		background-repeat: no-repeat;
+		background-position: center;
 	}
-
-	.could,
-	.sq {
-		height: 110rpx;
-		font-size: 32rpx;
-		font-weight: 600;
-		color: #333333;
-		line-height: 110rpx;
-		display: flex;
-		justify-content: space-between;
-
-		.num {
-			font-size: 40rpx;
-			font-weight: bold;
-			color: #333333;
-			// line-height: 46px;
-		}
+	.text {
+		color: $font-color-light;
 	}
-
-	.jg {
-		width: 100%;
-		height: 1px;
-		background-color: #E6E6E6;
-	}
-
-	.row-box {
-		margin-top: 30rpx;
-		padding: 20rpx 30rpx;
-		background: #fff;
-
-		.title {
-			font-size: $font-base + 2rpx;
-			color: $font-color-dark;
-		}
-
-		.row {
-			display: flex;
-			align-items: center;
-			position: relative;
-			height: 80rpx;
-
-			.tit {
-				flex-shrink: 0;
-				width: 40rpx;
-				font-size: 30rpx;
-				color: $font-color-dark;
-			}
-
-			.input {
-				flex: 1;
-				font-size: 30rpx;
-				color: $font-color-dark;
-			}
-
-			.iconlocation {
-				font-size: 36rpx;
-				color: $font-color-light;
-			}
-
-			.buttom {
-				color: #901b21;
-				font-size: $font-base;
-			}
-		}
+}
+
+.row-box {
+	margin-top: 30rpx;
+	padding: 20rpx 30rpx;
+	background: #fff;
+	.title {
+		font-size: $font-base + 2rpx;
+		color: $font-color-dark;
 	}
 	.row {
 		display: flex;
 		align-items: center;
 		position: relative;
-		padding: 0 30rpx;
-		height: 110rpx;
-		background: #fff;
-	
+		height: 80rpx;
 		.tit {
 			flex-shrink: 0;
-			width: 140rpx;
+			width: 40rpx;
 			font-size: 30rpx;
 			color: $font-color-dark;
 		}
-	
 		.input {
 			flex: 1;
 			font-size: 30rpx;
 			color: $font-color-dark;
 		}
-	
 		.iconlocation {
 			font-size: 36rpx;
 			color: $font-color-light;
 		}
+
+		.buttom {
+			color: $font-color-spec;
+			font-size: $font-base;
+		}
+	}
+}
+.add-btn {
+	&.modified {
+		color: $base-color;
+	}
+	&.up {
+		background-color: $base-color;
+		color: #fff;
+	}
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 690rpx;
+	height: 80rpx;
+	margin: 0 auto;
+	margin-top: 30rpx;
+	font-size: $font-lg;
+	border-radius: 10rpx;
+	// box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+}
+
+.list {
+	padding-left: 30rpx;
+	margin-top: 30rpx;
+	background-color: #ffffff;
+	.box {
+		display: flex;
+		align-items: center;
+		width: 100%;
+		height: 120rpx;
+		border-bottom: 1px solid $border-color-light;
+		.icon {
+			font-size: 48rpx;
+			padding-right: 20rpx;
+			.icon-img {
+				height: 50rpx;
+				width: 50rpx;
+			}
+		}
+		.iconweixin1 {
+			color: #18bf16;
+		}
+		.iconzhifubao {
+			color: #08aaec;
+		}
+		.title-box {
+			flex-grow: 1;
+			text-align: left;
+			.title {
+				font-size: $font-base + 2rpx;
+				color: $font-color-base;
+			}
+			.node {
+				font-size: $font-sm;
+				color: $font-color-light;
+			}
+		}
 	}
+}
+/deep/ .uni-radio-input {
+	width: 45rpx;
+	height: 45rpx;
+}
 </style>

pages/order/orderDetail.vue

@@ -1,7 +1,9 @@
 <template>
 	<view class="content">
 		<view class="row b-b b-t">
-			<text class="order-status" @click="item.delivery_type == 'express' ? towuliu(item) : ''">{{ item._status ? (item._status._msg == '已收货,快去评价一下吧' ? '已完成': item._status._msg) : '' }}</text>
+			<text class="order-status" @click="item.delivery_type == 'express' ? towuliu(item) : ''">
+				{{ item._status ? (item._status._msg == '已收货,快去评价一下吧' ? '已完成' : item._status._msg) : '' }}
+			</text>
 		</view>
 		<!-- 快递信息 -->
 		<view class="express-box" @click="expressCheck(item)" v-if="item.delivery_id != null">
@@ -22,8 +24,8 @@
 			</view>
 		</view>
 		<!-- 门店信息 -->
-		<view class="stores-wrapper"  v-if="item.shipping_type == 2 && item.store_id != 0">
-			<view class="store" >
+		<view class="stores-wrapper" v-if="item.shipping_type == 2 && item.store_id != 0">
+			<view class="store">
 				<view class="store-logo">
 					<image :src="item.system_store.image" mode=""></image>
 					<text class="store-name clamp">{{ item.system_store.name }}</text>
@@ -38,7 +40,7 @@
 				</view>
 				<view class="store-addr store-base">
 					距离：
-					<text>{{space(item.system_store.latitude, item.system_store.longitude) }}</text>
+					<text>{{ space(item.system_store.latitude, item.system_store.longitude) }}</text>
 				</view>
 				<view class="store-lv ">门店</view>
 			</view>
@@ -59,9 +61,7 @@
 						<text class="title">{{ goodsItem.productInfo.store_name }}</text>
 						<view class="title-right">
 							<view class="price">{{ goodsItem.productInfo.attrInfo.price }}</view>
-							<view class="attr-box">
-								{{ goodsItem.attrInfo ? goodsItem.attrInfo.suk : '' }} x {{ goodsItem.cart_num + '' }}
-							</view>
+							<view class="attr-box">{{ goodsItem.attrInfo ? goodsItem.attrInfo.suk : '' }} x {{ goodsItem.cart_num + '' }}</view>
 							<view>
 								<view v-if="status._type == 3">
 									<!-- <view @click="evaluate(goodsItem)" class="yesevaluate" v-if="goodsItem.is_reply > 0"><text>已评价</text></view> -->
@@ -83,7 +83,7 @@
 		</view>
 		<view class="row b-b flex">
 			<text class="tit">物流费用</text>
-			<view class="input">{{ (item.pay_postage*1 + item.pay_postage_sh*1) > 0 ? '￥' + (item.pay_postage*1 + item.pay_postage_sh*1) : '免邮费' }}</view>
+			<view class="input">{{ item.pay_postage * 1 + item.pay_postage * 1 > 0 ? '￥' + item.pay_postage * 1 : '免邮费' }}</view>
 		</view>
 		<view class="row b-b flex" v-if="item.deposit > 0">
 			<text class="tit">押金</text>
@@ -93,6 +93,10 @@
 			<text class="tit">积分抵扣</text>
 			<view class="input">-￥{{ item.use_integral }}</view>
 		</view>
+		<view class="row b-b flex" v-if="item.use_now_money > 0">
+			<text class="tit">余额抵扣</text>
+			<view class="input">-￥{{ item.use_now_money }}</view>
+		</view>
 		<view class="row b-b flex" v-if="item.coupon_id > 0">
 			<text class="tit">优惠券</text>
 			<view class="input">-￥{{ item.coupon_price }}</view>
@@ -100,7 +104,7 @@
 		<view class="row b-b flex">
 			<text class="tit ">实付</text>
 			<!-- <view class="input payColor" v-if="item.shipping_type == 1">￥{{ item.pay_price*1 }}</view> -->
-			<view class="input payColor">￥{{ item.pay_price*1 +item.deposit*1}}</view>
+			<view class="input payColor">￥{{ item.pay_price * 1 }}</view>
 		</view>
 
 		<view class="orderDetialBox">
@@ -123,7 +127,7 @@
 			</view>
 			<view class="item flex" v-if="item.time_area">
 				<view class="title-left flex">
-					<text class="title">{{item.shipping_type == 1 ? '配送时间:': '自提时间:'}}</text>
+					<text class="title">{{ item.shipping_type == 1 ? '配送时间:' : '自提时间:' }}</text>
 					<view class="text">{{ item.time_area }}</view>
 				</view>
 			</view>
@@ -178,15 +182,14 @@
 		</view>
 		<view class="btHeight"></view>
 		<view class="group-nav flex  b-t" v-if="item.combination_id > 0">
-<!-- 			<view class="bottom  border-radius-all bg-danger text-white padding-c-30 font-size-lg padding-v-10">出示券码</view>
+			<!-- 			<view class="bottom  border-radius-all bg-danger text-white padding-c-30 font-size-lg padding-v-10">出示券码</view>
 			<view class="bottom  border-radius-all bg-danger text-white padding-c-30 font-size-lg padding-v-10">确认收货</view> -->
 			<navigator :url="'/pages/product/groupBooking/detail?id=' + item.pink_id">
 				<view class="bottom  border-radius-all bg-danger text-white padding-c-30 font-size-lg padding-v-10" style="background: #901b21 !important;">查看拼团</view>
 			</navigator>
 		</view>
-	<!-- 	<view class="qrsh" v-if="isAlready " @click="orderTake" >确认收货</view> -->
-		<view class="" v-if="item.shipping_type == 2" style="height: 90rpx;">
-		</view>
+		<!-- 	<view class="qrsh" v-if="isAlready " @click="orderTake" >确认收货</view> -->
+		<view class="" v-if="item.shipping_type == 2" style="height: 90rpx;"></view>
 		<view class="zt-qrsh" v-if="item.shipping_type == 2 && item.status < 2">
 			<view class="hxm" @click="showCode" v-if="item.gift_uid == 0">出示券码</view>
 			<view class="zt-qr" @click="orderTake" v-if="item.verify_code == ''">确认收货</view>
@@ -197,7 +200,7 @@
 <script>
 import { orderDetail } from '@/api/order.js';
 import { orderList, orderCancel, orderDel, orderTake } from '@/api/order.js';
-import { loadIndexs, getIndexData, getStoreList, getPointList} from '@/api/index.js';
+import { loadIndexs, getIndexData, getStoreList, getPointList } from '@/api/index.js';
 export default {
 	filters: {
 		orderType: function(item) {
@@ -214,9 +217,9 @@ export default {
 	},
 	data() {
 		return {
-			store: {},//门店信息
-			isAlready: false,//订单是否处于配送状态
-			isZt: false,//订单是否为自提
+			store: {}, //门店信息
+			isAlready: false, //订单是否处于配送状态
+			isZt: false, //订单是否为自提
 			refund: '', //退款理由
 			reason: '', //备注
 			value: ['1', '2', '3', '4', '5', '6', '7', '8', 9, 10, 11, 12, 13],
@@ -280,15 +283,15 @@ export default {
 			let obj = this;
 			orderDetail({}, obj.orderId).then(e => {
 				obj.item = e.data;
-				console.log(obj.item,'item+++++++++++++')
+				console.log(obj.item, 'item+++++++++++++');
 				obj.item.cartInfo.forEach(e => {
 					// 计算vip优惠金额
-					obj.vipMoney += e.vip_truePrice*1;
+					obj.vipMoney += e.vip_truePrice * 1;
 				});
 				this.status = e.data._status;
 				console.log(e);
-				if(e.data.status === 1){
-					obj.isAlready = true
+				if (e.data.status === 1) {
+					obj.isAlready = true;
 				}
 				// if(obj.item.shipping_type == 2) {
 				// 	getPointList({
@@ -373,13 +376,11 @@ export default {
 							uni.showToast({
 								title: '收货成功'
 							});
-							setTimeout(()=> {
+							setTimeout(() => {
 								uni.navigateBack({
-								    delta: 1
+									delta: 1
 								});
-							},1500)
-
-							
+							}, 1500);
 						})
 						.catch(e => {
 							console.log(e);
@@ -391,7 +392,7 @@ export default {
 			// console.log(this.item._verify_code.replace(/^\s+|\s+$/g, ''))
 			uni.navigateTo({
 				url: '/pages/order/verifyCode?code=' + this.item._verify_code
-			})
+			});
 		}
 	}
 };
@@ -656,7 +657,7 @@ $btHeight: 100rpx;
 	line-height: 90rpx;
 	font-size: 36rpx;
 	font-weight: 500;
-	color: #901B21;
+	color: #901b21;
 	padding: 19rpx 0 20rpx 0;
 	background-color: #fff;
 	position: fixed;
@@ -671,7 +672,7 @@ $btHeight: 100rpx;
 		width: 339rpx;
 		height: 90rpx;
 		// border: 1px solid #901b21;
-		background-color: #901B21;
+		background-color: #901b21;
 		color: #fff;
 		border-radius: 45rpx;
 	}

pages/public/wxLogin.vue

@@ -3,20 +3,47 @@
 		<!-- #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="../../static/img/logo.jpg" mode=" aspectFit"></image>
+			<!-- 获取头像登录 -->
+			<!-- <button class="userInfo" type="warn" @click="isclick?'':userInfoData()" :class="{'nocaction': isclick}">
 				<text class="iconfont iconweixin"></text>
 				<text>
 				微信授权登录
 				</text>
-			</button>
+			</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>
 		</view>
 		<!-- #endif -->
 	</view>
 </template>
 
 <script>
-	import { getUserInfo } from '@/api/login.js';
+import { getUserInfo } from '@/api/login.js';
 // #ifdef H5
 import { loginWinxin } from '@/utils/wxAuthorized';
 // #endif
@@ -24,54 +51,83 @@ import { loginWinxin } from '@/utils/wxAuthorized';
 import { loginWinxinMp } from '@/utils/wxMinProgram';
 import { wechatMpAuth } from '@/api/wx';
 // #endif
-import { mapMutations,mapState } from 'vuex';
+import { mapMutations, mapState } from 'vuex';
 export default {
 	data() {
 		return {
-			userInfo:{},//授权用户信息
-			code:'',//授权code
-			isclick: false,//是否点击了
+			userInfo: {}, //授权用户信息
+			code: '', //授权code
+			isclick: false, //是否点击了
+			iv1: '',
+			encryptedData1: '',
+			hasphone: false
 		};
 	},
-	onLoad(option) {
+	onLoad() {
 		this.loadData();
 	},
 	computed: {
-		// ...mapState(['baseURL','urlFile']) 
+		// ...mapState(['baseURL','urlFile'])
 	},
 	methods: {
 		// ...mapMutations(['login', 'setUserInfo']),
-		...mapMutations('user',['login', 'setUserInfo']),
+		...mapMutations('user', ['login', 'setUserInfo']),
+		close() {
+			this.$refs.popupsq.close();
+		},
+		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;
+			}
+		},
 		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)
-						}
-					})
+			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++++++');
+					},
+					fill: function(e) {
+						console.log(e);
+					}
+				});
 			});
 			// #endif
 		},
 		// 用户确认授权
-		userInfoData(){
-			let that = this
-			if(that.isclick) {
-				return 
+		userInfoData() {
+			let that = this;
+			if (that.isclick) {
+				return;
 			}
-			that.isclick = true
+			that.isclick = true;
 			wx.getUserProfile({
 				desc: '用于完善会员资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
 				success: res => {
-					console.log(res,'that.userInfo+++++++++++++++++++')
+					console.log(res, 'that.userInfo+++++++++++++++++++');
 					that.userInfo = res;
 					uni.showLoading({
 						title: '授权中',
@@ -80,7 +136,7 @@ export default {
 					that.loadMp();
 				},
 				fail: err => {
-					that.isclick = false
+					that.isclick = false;
 					uni.showToast({
 						title: '您拒绝了请求,不能正常使用小程序',
 						icon: 'error',
@@ -92,68 +148,98 @@ export default {
 			// this.userInfo = e;
 			// console.log(e,'用户确认授权')
 			// this.loadMp()
-				
 		},
 		// #ifdef MP-WEIXIN
 		loadMp() {
 			let obj = this;
 			// 获取登录授权页数据
 			let user = obj.userInfo;
-			console.log(user)
+			console.log(user);
 			// 获取推广人id
 			let spread_spid = uni.getStorageSync('spread') || '';
 			// #ifdef MP
 			let spread_code = uni.getStorageSync('spread_code') || '';
 			// #endif
-			
+
 			wechatMpAuth({
 				code: obj.code,
 				iv: user.iv,
+				iv1: obj.iv1,
+				encryptedData1: obj.encryptedData1,
 				encryptedData: user.encryptedData,
 				spread_spid: spread_spid,
 				// #ifdef MP
-				spread_code: spread_code,
+				spread_code: spread_code
 				// #endif
-			}).then(({ data }) => {
-				obj.wchatAuth(data);
-				console.log(data,'wechatMpAuth++++++++++++++++++++++++++')
-				
-			}).catch( err => {
-				// obj.loding = false;
-				// uni.hideLoading();
-			});
+			})
+				.then(({ data }) => {
+					obj.wchatAuth(data);
+					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++++++++++++++')
+			console.log(data.token, 'token++++++++++++++');
 			// 获取用户基础信息
 			getUserInfo({}).then(e => {
-				console.log('userInfo+++++++++++',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'
+				obj.go();
+				// if (e.data.nickname == '微信用户') {
+				// 	uni.showModal({
+				// 		title: '提示',
+				// 		content: '您暂未设置用户名，头像。是否前往设置',
+				// 		success: function(res) {
+				// 			if (res.confirm) {
+				// 				uni.navigateTo({
+				// 					url: '/pages/set/set'
+				// 				});
+				// 			} 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({
+						url: ur,
+						fail(e) {
+							uni.navigateTo({
+								url: '/pages/index/index'
+							});
+						}
+					});
 				}
-				uni.switchTab({
-					url: ur,
-					fail(e) {
-						uni.navigateTo({
-							url: ur,
-							fail(e) {
-								uni.navigateTo({
-									url: '/pages/index/index',
-								});
-							}
-						});
-					}
-				});
 			});
 		}
 	}
@@ -166,6 +252,7 @@ page,
 	height: 100%;
 	background-color: #fff;
 }
+
 .bg-img,
 .logo-img-box {
 	position: absolute;
@@ -174,20 +261,49 @@ page,
 	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;
+	color: #ffffff;
 	border-radius: 99rpx;
 	background-color: $base-color !important;
 }
+
 .nocaction {
 	background-color: #999;
 }
+
+.popupsq-wrap {
+	width: 550rpx;
+	height: 450rpx;
+	background-color: #fff;
+	border-radius: 20rpx;
+	padding: 0 30rpx;
+
+	.btn {
+		width: 240rpx;
+		height: 90rpx;
+		text-align: center;
+		line-height: 90rpx;
+		font-size: 30rpx;
+		border-radius: 45rpx;
+		font-weight: bold;
+	}
+	.qx {
+		color: #000;
+		border: #f0f0f0 1px solid;
+	}
+	.qr {
+		color: #fff;
+		background-color: $base-color;
+	}
+}
 </style>

pages/set/set.vue

@@ -1,5 +1,22 @@
 <template>
 	<view class="container">
+		<!-- #ifdef MP-WEIXIN -->
+		<view class="row b-b flex jg">
+			<text class="tit">头像</text>
+			<image :src="userInfo.avatar" @click.stop="imgsub"></image>
+		</view>
+		<!-- <view class="row b-b flex jg">
+			<text class="tit">头像</text>
+			<button type="primary" open-type="chooseAvatar" @chooseavatar="onChooseAvatar" plain="true" style="border: none;position: relative;">
+				<image :src="userInfo.avatar" @click="imgsub"></image>
+			</button>
+		</view> -->
+		<view class="row b-b flex">
+			<text class="tit">昵称</text>
+			<input class="input" v-model="userInfo.nickname" type="nickname" @blur="test" placeholder-class="placeholder" />
+		</view>
+		<!-- #endif -->
+		<!-- #ifndef MP-WEIXIN -->
 		<view class="row b-b flex jg">
 			<text class="tit">头像</text>
 			<image :src="userInfo.avatar" @click.stop="imgsub"></image>
@@ -8,14 +25,11 @@
 			<text class="tit">昵称</text>
 			<input class="input" v-model="userInfo.nickname" type="text" placeholder-class="placeholder" />
 		</view>
+		<!-- #endif -->
 		<view class="row b-b flex">
 			<text class="tit">ID</text>
 			<input class="input" v-model="userInfo.uid" type="text" disabled="true" placeholder-class="placeholder" />
 		</view>
-		<view class="row b-b flex">
-			<text class="tit">用户账号</text>
-			<input class="input" v-model="userInfo.account || userInfo.phone" type="number" disabled="true" placeholder-class="placeholder" />
-		</view>
 		<view class="submit-box ">
 			<view class="submit" @click="edit">确认修改</view>
 			<view class="submit submit1" @click="toLogout">退出登录</view>
@@ -41,6 +55,18 @@ export default {
 			pics: []
 		};
 	},
+	// onUnload() {
+	// 	if (this.userInfo.nickname == '微信用户') {
+	// 		logout({})
+	// 			.then(e => {
+	// 				obj.logout();
+	// 			})
+	// 			.catch(e => {
+	// 				console.log(e);
+	// 			});
+	// 	}
+	// 	console.log('222');
+	// },
 	onLoad() {
 		this.userInfo = uni.getStorageSync('userInfo') || '';
 		console.log(this.userInfo);
@@ -78,6 +104,12 @@ export default {
 				obj.userInfo.avatar = res[0].url;
 			});
 		},
+		test(e) {
+			console.log(e.detail, '123456');
+		},
+		onChooseAvatar(e) {
+			this.userInfo.avatar = e.detail.avatarUrl;
+		},
 		edit() {
 			const that = this;
 			uni.showLoading({
@@ -121,7 +153,13 @@ page {
 	padding: 42rpx 25rpx;
 	font-size: 30rpx;
 	color: #333333;
-
+	button {
+		width: 80rpx;
+		height: 80rpx;
+		margin: 0;
+		padding: 0;
+		border-radius: 50%;
+	}
 	image {
 		width: 80rpx;
 		height: 80rpx;

pages/user/shareEx.vue

@@ -0,0 +1,172 @@
+<template>
+	<view class="content">
+		<image src="../../static/img/share-card.jpg" mode="" class="bg"></image>
+		<view class=""></view>
+		<view class="share-user-logo"><image :src="userlogo" mode=""></image></view>
+		<view class="good">
+			{{ num }}
+			<text>元</text>
+		</view>
+		<view class="good-tit">某娘鲜食红包</view>
+		<button class="share-btn" open-type="share" v-if="couldshare == 1">立即分享</button>
+		<view class="share-btn" v-if="couldshare == 2" @click="getGift">{{ jsspan }}</view>
+	</view>
+</template>
+
+<script>
+import { getredbag } from '@/api/user.js';
+export default {
+	data() {
+		return {
+			userlogo: '',
+			shareId: '',
+			nickname: '',
+			num: '',
+			couldshare: 0,
+			jsspan: '立即领取'
+		};
+	},
+	onLoad(opt) {
+		this.userlogo = opt.logo;
+		this.shareId = opt.shareid;
+		this.nickname = opt.nickname;
+		this.num = opt.num;
+		this.couldshare = opt.type;
+
+		// #ifdef MP
+		if (opt.type == 2) {
+			if (opt.scene) {
+				// 存储小程序邀请人
+				uni.setStorage({
+					key: 'spread_code',
+					data: opt.scene
+				});
+			}
+		}
+		// #endif
+	},
+	// 分享
+	onShareAppMessage(options) {
+		let obj = this;
+		// 设置菜单中的转发按钮触发转发事件时的转发内容
+		let pages = getCurrentPages(); //获取加载的页面
+		let currentPage = pages[pages.length - 1]; //获取当前页面的对象
+		let url = currentPage.route; //当前页面url
+		let item = currentPage.options; //如果要获取url中所带的参数可以查看options
+		// let name = this.goodsObjact.store_name || this.goodsObjact.title;
+		let shareObj = {
+			title: obj.nickname + '分享某娘鲜食红包', // 默认是小程序的名称(可以写slogan等)
+			path: url + '?shareid=' + item.shareid + '&scene=' + item.scene + '&logo=' + item.logo + '&num=' + item.num + '&type=2' + '&nickname=' + item.nickname, // 默认是当前页面，必须是以‘/’开头的完整路径
+			success: function(res) {
+				console.log(shareObj.path, 'path+++++++++++++++++++');
+				// 转发成功之后的回调
+				if (res.errMsg == 'shareAppMessage:ok') {
+				}
+			},
+			fail: function() {
+				// 转发失败之后的回调
+				if (res.errMsg == 'shareAppMessage:fail cancel') {
+					// 用户取消转发
+				} else if (res.errMsg == 'shareAppMessage:fail') {
+					// 转发失败，其中 detail message 为详细失败信息
+				}
+			}
+		};
+
+		return shareObj;
+	},
+	methods: {
+		getGift() {
+			let obj = this;
+			console.log('ddd');
+			getredbag({}, this.shareId)
+				.then(res => {
+					console.log(res);
+					uni.showToast({
+						title: '领取成功',
+						duration: 2000
+					});
+					obj.jsspan = '已领取';
+					setTimeout(() => {
+						uni.switchTab({
+							url: '/pages/index/index'
+						});
+					}, 1500);
+				})
+				.catch(err => {
+					console.log(err);
+				});
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+page {
+	background-color: #ffffff;
+	width: 100%;
+	height: 100%;
+}
+.content {
+	position: relative;
+	background-color: #ffffff;
+	min-height: 100%;
+	.bg {
+		// position: absolute;
+		width: 750rpx;
+		height: 1334rpx;
+	}
+	.share-btn {
+		width: 492rpx;
+		height: 86rpx;
+		background-color: #ebd49e;
+		border-radius: 43rpx;
+		text-align: center;
+		line-height: 86rpx;
+		color: #ee2f72;
+		font-weight: bold;
+		font-size: 36rpx;
+		position: absolute;
+		top: 1159rpx;
+		left: 130rpx;
+	}
+	.share-user-logo {
+		position: absolute;
+		top: 400rpx;
+		left: 0;
+		right: 0;
+		margin: auto;
+		width: 118rpx;
+		height: 118rpx;
+		border-radius: 50%;
+		image {
+			width: 118rpx;
+			height: 118rpx;
+			border-radius: 50%;
+		}
+	}
+	.good {
+		border-radius: 20rpx;
+		position: absolute;
+		top: 560rpx;
+		left: 0;
+		right: 0;
+		margin: auto;
+		color: #eb5648;
+		font-weight: bold;
+		text-align: center;
+		font-size: 160rpx;
+		text {
+			font-size: 80rpx;
+		}
+	}
+	.good-tit {
+		font-size: 40rpx;
+		position: absolute;
+		color: #eb5648;
+		text-align: center;
+		width: 750rpx;
+		top: 800rpx;
+	}
+}
+</style>

pages/user/user.vue

@@ -10,7 +10,7 @@
 					<view class="phone" v-if="userInfo.phone">{{ userInfo.phone | hiddenphone }}</view>
 				</view>
 			</view>
-			<view class="config">
+			<view class="config" v-if="userInfo.is_promoter != 0">
 				<view class="setting"><image src="../../static/icon/set.png" mode=""></image></view>
 				<view class="config-font">VIP会员</view>
 			</view>
@@ -30,14 +30,14 @@
 				</view>
 				<view class="tj-item" @click="navTo('/user/page/extension')">
 					<view class="tj-img"><image src="../../static/icon/my4.png" mode=""></image></view>
-					<view class="tj-num">{{ userInfo.spead_count || 0 }}</view>
+					<view class="tj-num">{{ userInfo.spread_count || 0 }}</view>
 					<view class="tj-font">我的推广</view>
 				</view>
 			</view>
 		</view>
 		<view class="cover-container">
 			<view class="order-section">
-				<view class="order-item" @click="navTo('/user/page/shareQrCode')" hover-class="common-hover" :hover-stay-time="50">
+				<view class="order-item" @click="navTo('/user/page/shareQrCode')" hover-class="common-hover" :hover-stay-time="50" v-if="userInfo.is_promoter != 0">
 					<view class="o-ic">
 						<view class="icon"><image class="icon-img" src="/static/icon/1-my.png" mode="widthFix"></image></view>
 						<view class="text">邀请海报</view>

store/model/user.js

@@ -10,12 +10,12 @@ let state = {
 	hasLogin: false, //是否登录
 	checkedStore: {},
 	checkedPoint: '',
-	latlng: '',//当前坐标
+	latlng: '', //当前坐标
 	latitude: '',
 	longitude: '',
-	des: '',//距离
-	dhqList: [],//优惠券
-	distribution: 1//配送方式1是自提2是外卖
+	des: '', //距离
+	dhqList: [], //优惠券
+	distribution: 2 //配送方式1是自提2是外卖
 }
 
 let mutations = {
@@ -65,25 +65,25 @@ let mutations = {
 			data: provider
 		})
 	},
-	setPointInfo(state,provider) {
+	setPointInfo(state, provider) {
 		state.checkedPoint = provider;
 	},
-	setDes(state,provider) {
+	setDes(state, provider) {
 		state.des = provider
 	},
-	setLatlng(state,provider) {
+	setLatlng(state, provider) {
 		state.latlng = provider
 	},
-	setLatitude(state,provider) {
+	setLatitude(state, provider) {
 		state.latitude = provider
 	},
-	setLongitude(state,provider) {
+	setLongitude(state, provider) {
 		state.longitude = provider
 	},
-	setDhqList(state,provider) {
+	setDhqList(state, provider) {
 		state.dhqList = provider
 	},
-	setDistribution(state,provider){
+	setDistribution(state, provider) {
 		state.distribution = provider
 	}
 }

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.b0707a6a.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.be6b9e0a.js></script><script src=/index/static/js/index.28a7a21d.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.5841170f.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.e9814061.js></script><script src=/index/static/js/index.cbf94e1f.js></script></body></html>