9-30

api/activity.js

@@ -253,6 +253,13 @@ export function getJfList(data) {
 	return request.get('product/spu/hot/integral')
 }
 
+/**
+ * 获取健康商品列表
+ */
+export function getJkList(data) {
+	return request.get('product/spu/hot/is_healthy')
+}
+
 
 /**
  * 获取消费专区商品列表

api/user.js

@@ -681,3 +681,12 @@ export function serviceSaveMark(merId, uid, mark) {
 		mark
 	})
 }
+
+/**
+ * 静态积分转余额
+ * @param object data
+ * 
+ */
+export function jtjfzye(data) {
+	return request.post(`user/transformation`, data)
+}

api/wallet.js

@@ -147,3 +147,8 @@ export function integrallist(data) {
 export function getBank(data) {
 	return request.get('user/pay_list', data)
 }
+
+//	权益积分列表
+export function healthyIntegrallist(data) {
+	return request.get('user/healthyBill', data)
+}

components/Authorize.vue

@@ -1,6 +1,6 @@
 <template>
 	<view :style="viewColor">
-		<view class='Popup' v-if='isShowAuth && code'>
+		<view class='Popup' v-if='isShowAuth && code && showsq'>
 <!-- 			<view class="logo-auth">
 				<image :src='routine_logo' mode="aspectFit"></image>
 			</view> -->
@@ -9,8 +9,10 @@
 			<view class='bottom flex'>
 				<view class='item' @click='close'>随便逛逛</view>
 				<!-- #ifdef MP -->
-				<button class="item grant" hover-class="none"
-					@tap="getUserProfile">登录</button>
+				<!-- <button class="item grant" hover-class="none"
+					@tap="getUserProfile">登录</button> -->
+				<button class="item grant" hover-class="none" open-type="getPhoneNumber"
+					@getphonenumber="getPhoneNumber">登录</button>
 				<!-- #endif -->
 				<!-- #ifdef H5 || APP-PLUS -->
 				<button class="item grant"
@@ -18,7 +20,12 @@
 				<!-- #endif -->
 			</view>
 		</view>
+		<!-- #ifndef MP-WEIXIN -->
 		<view class='mask' v-if='isShowAuth && code' @click='close'></view>
+		<!-- #endif -->
+		<!-- #ifdef MP-WEIXIN -->
+		<view class='mask' v-if='isShowAuth && code && showsq' @click='close'></view>
+		<!-- #endif -->
 	</view>
 </template>
 
@@ -64,6 +71,10 @@
 			return {
 				canUseGetUserProfile: false,
 				code: null,
+				showsq: true,
+				isclick: false,
+				iv1: '',
+				encryptedData1: '',
 			}
 		},
 		computed: {
@@ -86,6 +97,60 @@
 			this.getCode(this.isShowAuth)
 		},
 		methods: {
+			//
+			getPhoneNumber(e) {
+				let self = this
+				let obj = this
+				console.log(e, 'e+++++++++++++++')
+				//用户同意授权
+				if (e.detail.errMsg == "getPhoneNumber:ok") {
+					let userInfo = {}
+					userInfo.iv = e.detail.iv
+					userInfo.encryptedData = e.detail.encryptedData
+					userInfo.code = this.code;
+					userInfo.spread = app.globalData.spid; //获取推广人ID
+					userInfo.spread_code = app.globalData.code; //获取推广人分享二维码ID
+					console.log(userInfo,'userInfo+++++')
+					commonAuth({
+						auth: {
+						type:'routine',
+						auth: userInfo
+					}
+					}).then(res=>{
+						if(res.data.status == 200){
+							let time = res.data.result.expires_time - Cache.time();
+							self.$store.commit('UPDATE_USERINFO', res.data.result.user);
+							self.$store.commit('LOGIN', {token:res.data.result.token, time:time});
+							self.$store.commit('SETUID', res.data.result.user.uid);
+							Cache.set(EXPIRES_TIME,res.data.result.expires_time,time);
+							Cache.set(USER_INFO,res.data.result.user,time);
+							this.$emit('onLoadFun', res.data.result.user);
+						}else{
+							uni.setStorageSync('auth_token',res.data.result.key);
+							return uni.navigateTo({
+								url:'/pages/users/login/index'
+							})
+						}
+					}).catch(res => {
+						uni.hideLoading();
+						uni.showToast({
+							title: res.message,
+							icon: 'none',
+							duration: 2000,
+							
+						});
+					});
+					
+				} else {
+					obj.isclick = false
+					uni.showToast({
+						title: '您拒绝了请求,不能正常使用小程序',
+						icon: 'error',
+						duration: 2000
+					});
+					return;
+				}
+			},
 			setAuthStatus() {
 				//#ifdef MP
 				Routine.authorize().then(res => {
@@ -182,6 +247,39 @@
 				// 	this.$emit('authColse', false);
 				// }
 			},
+			// 用户确认授权
+			userInfoData() {
+				let that = this
+				if (that.isclick) {
+					return
+				}
+				that.isclick = true
+				wx.getUserProfile({
+					desc: '用于完善会员资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
+					success: res => {
+						console.log(res, 'that.userInfo+++++++++++++++++++')
+						that.userInfo = res;
+						uni.showLoading({
+							title: '授权中',
+							mask: true
+						});
+						that.loadMp();
+					},
+					fail: err => {
+						that.isclick = false
+						uni.showToast({
+							title: '您拒绝了请求,不能正常使用小程序',
+							icon: 'error',
+							duration: 2000
+						});
+						return;
+					}
+				});
+				// this.userInfo = e;
+				// console.log(e,'用户确认授权')
+				// this.loadMp()
+			
+			},
 		}
 	}
 </script>
@@ -272,4 +370,29 @@
 		background-color: rgba(0, 0, 0, 0.65);
 		z-index: 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: #637bef;
+		}
+	}
 </style>

components/adc/index.vue

@@ -15,7 +15,7 @@
 			</view>
 			<!-- 无地址 -->
 			<view class='pictrue' v-if="!is_loading && !addressList.length">
-				<image src='../../static/images/noAddress.png'></image>
+				<image src='http://ygs.hqgjsmc.com/baseimg/noAddress.png'></image>
 			</view>
 			<view class='addressBnt bg-color' @tap='goAddressPages'>选择其地址</view>
 		</view>

components/addressWindow/index.vue

@@ -15,7 +15,7 @@
 			</scroll-view>
 			<!-- 无地址 -->
 			<view class='pictrue' v-if="!is_loading && !addressList.length">
-				<image src='../../static/images/noAddress.png'></image>
+				<image src='http://ygs.hqgjsmc.com/baseimg/noAddress.png'></image>
 				<view>暂无地址</view>
 			</view>
 			<view class='addressBnt' @tap='goAddressPages'>添加新地址</view>

components/comment.vue

@@ -54,7 +54,7 @@
 						</view>
 						<Loading :loaded="loaded" :loading="loading"></Loading>
 						<view v-if="list.length == 0 && !loading" class="empty">
-							<image src="/static/images/no_commen.png"></image>
+							<image src="http://ygs.hqgjsmc.com/baseimg/no_commen.png"></image>
 							<text>暂无评论，快去抢沙发吧~</text>
 						</view>
 						

components/home/index.vue

@@ -8,7 +8,7 @@
 			</view>
 			<view @click="open" class="pictrueBox">
 				<view class="pictrue">
-					<image :src="homeActive === true ? '/static/images/navbtn_open.gif' : '/static/images/navbtn_close.gif'"
+					<image :src="homeActive === true ? 'http://ygs.hqgjsmc.com/baseimg/navbtn_open.gif' : 'http://ygs.hqgjsmc.com/baseimg/navbtn_close.gif'"
 					 class="image pictruea" />
 				</view>
 			</view>

components/shareInfo/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view v-if="shareInfoStatus" class="poster-first">
 	    <view class="mask-share">
-			<image src="/static/images/share-info.png" @click="shareInfoClose" @touchmove.stop.prevent="false"></image>
+			<image src="http://ygs.hqgjsmc.com/baseimg/share-info.png" @click="shareInfoClose" @touchmove.stop.prevent="false"></image>
 	    </view>
 	  </view>
 </template>

main.js

@@ -16,9 +16,9 @@ import {
 	HTTP_REQUEST_URL
 } from '@/config/app';
 import skeleton from './components/skeleton/index.vue'
-import dsbridge from '@/static/js/dsbridge.js'
+// import dsbridge from '@/static/js/dsbridge.js'
 Vue.component('skeleton', skeleton)
-Vue.prototype.$dsbridge = dsbridge
+// Vue.prototype.$dsbridge = dsbridge
 const msg = (title, duration = 1500, mask = false, icon = 'none') => {
 	//统一提示方便全局修改
 	if (Boolean(title) === false) {

manifest.json

@@ -2,8 +2,8 @@
     "name" : "环球优购",
     "appid" : "__UNI__F8C6120",
     "description" : "",
-    "versionName" : "1.0.4",
-    "versionCode" : 127,
+    "versionName" : "1.3.3",
+    "versionCode" : 133,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -17,10 +17,6 @@
         },
         /* 模块配置 */
         "modules" : {
-            "VideoPlayer" : {},
-            "OAuth" : {},
-            "Payment" : {},
-            "Share" : {},
             "iBeacon" : {},
             "Geolocation" : {},
             "Maps" : {}
@@ -41,12 +37,14 @@
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
                     "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
                     "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
                     "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
                     "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
@@ -61,7 +59,8 @@
                     "NSLocationWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店",
                     "NSLocationAlwaysUsageDescription" : "根据客户地理位置推荐最近门店"
                 },
-                "idfa" : false
+                "idfa" : false,
+                "dSYMs" : false
             },
             /* SDK配置 */
             "sdkConfigs" : {
@@ -71,22 +70,8 @@
                         "appkey_android" : "918f3fa2dbc0f82f3e4ad9731f60d18b"
                     }
                 },
-                "payment" : {
-                    "weixin" : {
-                        "__platform__" : [ "ios", "android" ],
-                        "appid" : "wx96889357cae8bc75",
-                        "UniversalLinks" : "https://mer.crmeb.net/"
-                    },
-                    "alipay" : {
-                        "__platform__" : [ "ios", "android" ]
-                    }
-                },
-                "share" : {
-                    "weixin" : {
-                        "appid" : "wx96889357cae8bc75",
-                        "UniversalLinks" : "https://mer.crmeb.net/"
-                    }
-                },
+                "payment" : {},
+                "share" : {},
                 "geolocation" : {
                     "amap" : {
                         "__platform__" : [ "ios", "android" ],
@@ -95,14 +80,7 @@
                     }
                 },
                 "push" : {},
-                "oauth" : {
-                    "apple" : {},
-                    "weixin" : {
-                        "appid" : "wx96889357cae8bc75",
-                        "appsecret" : "ff8a8d38c07d613a8a70f6d04755b45c",
-                        "UniversalLinks" : "https://mer.crmeb.net/"
-                    }
-                },
+                "oauth" : {},
                 "ad" : {}
             },
             "icons" : {
@@ -138,7 +116,13 @@
                 }
             },
             "splashscreen" : {
-                "useOriginalMsgbox" : true
+                "useOriginalMsgbox" : true,
+                "androidStyle" : "default",
+                "android" : {
+                    "hdpi" : "unpackage/res/base/480.png",
+                    "xhdpi" : "unpackage/res/base/720.png",
+                    "xxhdpi" : "unpackage/res/base/1080.png"
+                }
             }
         }
     },
@@ -146,7 +130,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx5fb1cc8edb3f8baa",
+        "appid" : "wx58e0376b093df14a",
         "setting" : {
             "urlCheck" : false,
             "minified" : true,
@@ -155,10 +139,11 @@
         },
         "permission" : {
             "scope.userLocation" : {
-                "desc" : "获取您的位置"
+                "desc" : "需要根据你的定位来给你推送最近的门店"
             }
         },
-        "usingComponents" : true
+        "usingComponents" : true,
+        "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ]
     },
     "mp-alipay" : {
         "usingComponents" : true
@@ -187,5 +172,6 @@
         },
         "title" : "环球优购",
         "template" : "template.h5.html"
-    }
+    },
+    "fallbackLocale" : "en"
 }

pages.json

@@ -5,6 +5,7 @@
 			"style": {
 				"navigationBarTitleText": "首页",
 				"navigationStyle": "custom",
+				"enablePullDownRefresh": true,
 				// #ifdef APP-PLUS
 				"enablePullDownRefresh": true,
 				// #endif
@@ -13,12 +14,24 @@
 				}
 			}
 		},
+		// {
+		// 	"path": "pages/store/shopStreet/index",
+		// 	"style": {
+		// 		"navigationBarTitleText": "店铺街"
+		// 	}
+		// },
 		{
 			"path": "pages/index/register",
 			"style": {
 				"navigationBarTitleText": "积分专区"
 			}
 		},
+		{
+			"path": "pages/index/jkzq",
+			"style": {
+				"navigationBarTitleText": "健康专区"
+			}
+		},
 		{
 			"path": "pages/index/bdzq",
 			"style": {
@@ -52,7 +65,8 @@
 		{
 			"path": "pages/user/index",
 			"style": {
-				"navigationBarTitleText": "个人中心"
+				"navigationBarTitleText": "个人中心",
+				"navigationStyle": "custom"
 				//,
 				//"navigationBarBackgroundColor": "#EB3C3C"
 				// #ifdef MP || APP-PLUS
@@ -68,6 +82,13 @@
 
 			}
 		},
+		{
+			"path": "pages/user/jfzye",
+			"style": {
+				"navigationBarTitleText": "静态积分转余额"
+		
+			}
+		},
 		{
 			"path": "pages/user/mythq",
 			"style": {
@@ -101,6 +122,15 @@
 				}
 			}
 		},
+		{
+			"path": "pages/user/qyjf",
+			"style": {
+				"navigationBarTitleText": "权益积分",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
 		{
 			"path": "pages/user/myjf",
 			"style": {
@@ -199,6 +229,67 @@
 				"navigationBarTitleText": "支付提示"
 			}
 		}
+		// {
+		// 	"path": "pages/store/index",
+		// 	"style": {
+		// 		"navigationStyle": "custom",
+		// 		"navigationBarTitleText": "店铺diy首页"
+		// 			// #ifdef MP
+		// 			,
+		// 		"navigationBarTextStyle": "#FFFFFF"
+		// 		// #endif
+		// 	}
+		// }, {
+		// 	"path": "pages/store/home/index",
+		// 	"style": {
+		// 		"navigationStyle": "custom",
+		// 		"navigationBarTitleText": "店铺首页"
+		// 			// #ifdef MP
+		// 			,
+		// 		"navigationBarTextStyle": "#FFFFFF"
+		// 		// #endif
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/store/detail/index",
+		// 	"style": {
+		// 		"navigationBarTitleText": "店铺详情"
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/store/list/index",
+		// 	"style": {
+		// 		"navigationBarTitleText": "商品列表"
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/store/settled/index",
+		// 	"style": {
+		// 		"navigationBarTitleText": "商家入驻"
+		// 	}
+		// }, {
+		// 	"path": "pages/store/applicationRecord/index",
+		// 	"style": {
+		// 		"navigationBarTitleText": "申请记录"
+		// 	}
+		// }, {
+		// 	"path": "pages/store/merchantDetails/index",
+		// 	"style": {
+		// 		"navigationBarTitleText": "审核通过"
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/store/shopStreet/index",
+		// 	"style": {
+		// 		"navigationBarTitleText": "店铺街"
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/store/qualifications/index",
+		// 	"style": {
+		// 		"navigationBarTitleText": "店铺资质信息"
+		// 	}
+		// }
 	],
 	"subPackages": [{
 			"root": "pages/users",
@@ -331,21 +422,21 @@
 				{
 					"path": "user_spread_code/index",
 					"style": {
-						"navigationBarTitleText": "分销海报"
-					}
-				},
-				{
-					"path": "user_spread_money/index",
-					"style": {
-						"navigationBarTitleText": "佣金记录"
-						//,
-						//"navigationBarBackgroundColor": "#e93323"
-						// #ifdef MP || APP-PLUS
-						//	,
-						//"navigationBarTextStyle": "#fff"
-						// #endif
+						"navigationBarTitleText": "分享海报"
 					}
 				},
+				// {
+				// 	"path": "user_spread_money/index",
+				// 	"style": {
+				// 		"navigationBarTitleText": "佣金记录"
+				// 		//,
+				// 		//"navigationBarBackgroundColor": "#e93323"
+				// 		// #ifdef MP || APP-PLUS
+				// 		//	,
+				// 		//"navigationBarTextStyle": "#fff"
+				// 		// #endif
+				// 	}
+				// },
 				{
 					"path": "user_cash/index",
 					"style": {
@@ -433,49 +524,49 @@
 				{
 					"path": "promoter-list/index",
 					"style": {
-						"navigationBarTitleText": "推广人列表"
-
-						// #ifdef MP || APP-PLUS
-						//	,
-						//"navigationBarTextStyle": "#fff"
-						// #endif
-					}
-				},
-				{
-					"path": "promoter-order/index",
-					"style": {
-						"navigationBarTitleText": "推广人订单"
-						//,
-						//"navigationBarBackgroundColor": "#e93323"
-						// #ifdef MP || APP-PLUS
-						//	,
-						//"navigationBarTextStyle": "#fff"
-						// #endif
-					}
-				},
-				{
-					"path": "promoter_rank/index",
-					"style": {
-						"navigationBarTitleText": "推广人排行"
-						//,
-						//"navigationBarBackgroundColor": "#e93323"
+						"navigationBarTitleText": "我的推广",
+						"navigationStyle": "custom"
 						// #ifdef MP || APP-PLUS
 						//	,
 						//"navigationBarTextStyle": "#fff"
 						// #endif
 					}
 				},
-				{
-					"path": "commission_rank/index",
-					"style": {
-						"navigationBarTitleText": "佣金排行"
-						// "navigationBarBackgroundColor": "#e93323"
-						// #ifdef MP || APP-PLUS
-						// ,
-						// "navigationBarTextStyle": "#fff"
-						// #endif
-					}
-				},
+				// {
+				// 	"path": "promoter-order/index",
+				// 	"style": {
+				// 		"navigationBarTitleText": "推广人订单"
+				// 		//,
+				// 		//"navigationBarBackgroundColor": "#e93323"
+				// 		// #ifdef MP || APP-PLUS
+				// 		//	,
+				// 		//"navigationBarTextStyle": "#fff"
+				// 		// #endif
+				// 	}
+				// },
+				// {
+				// 	"path": "promoter_rank/index",
+				// 	"style": {
+				// 		"navigationBarTitleText": "推广人排行"
+				// 		//,
+				// 		//"navigationBarBackgroundColor": "#e93323"
+				// 		// #ifdef MP || APP-PLUS
+				// 		//	,
+				// 		//"navigationBarTextStyle": "#fff"
+				// 		// #endif
+				// 	}
+				// },
+				// {
+				// 	"path": "commission_rank/index",
+				// 	"style": {
+				// 		"navigationBarTitleText": "佣金排行"
+				// 		// "navigationBarBackgroundColor": "#e93323"
+				// 		// #ifdef MP || APP-PLUS
+				// 		// ,
+				// 		// "navigationBarTextStyle": "#fff"
+				// 		// #endif
+				// 	}
+				// },
 				{
 					"path": "order_list/index",
 					"style": {
@@ -613,13 +704,13 @@
 						"backgroundColor": "#FFFFFF"
 					}
 				},
-				{
-					"path": "distributor/index",
-					"style": {
-						"navigationBarTitleText": "成为分销",
-						"backgroundColor": "#FFFFFF"
-					}
-				},
+				// {
+				// 	"path": "distributor/index",
+				// 	"style": {
+				// 		"navigationBarTitleText": "成为分销",
+				// 		"backgroundColor": "#FFFFFF"
+				// 	}
+				// },
 				{
 					"path": "user_invoice_list/index",
 					"style": {
@@ -661,7 +752,8 @@
 		{
 			"root": "pages/store",
 			"name": "store",
-			"pages": [{
+			"pages": [
+				{
 					"path": "index",
 					"style": {
 						"navigationStyle": "custom",
@@ -1002,13 +1094,14 @@
 						"navigationBarTitleText": "搜索商品"
 					}
 				}
-			],
-			"plugins": {
-				"live-player-plugin": {
-					"version": "1.3.2",
-					"provider": "wx2b03c6e691cd7370"
-				}
-			}
+			]
+			// ,
+			// "plugins": {
+			// 	"live-player-plugin": {
+			// 		"version": "1.3.2",
+			// 		"provider": "wx2b03c6e691cd7370"
+			// 	}
+			// }
 		},
 		{
 			"root": "pages/chat",
@@ -1064,14 +1157,14 @@
 						// #endif
 					}
 				},
-				{
-					"path": "liveBroadcast/index",
-					"style": {
-						"navigationBarTitleText": "直播列表",
-						"navigationBarBackgroundColor": "#F2F2F2"
+				// {
+				// 	"path": "liveBroadcast/index",
+				// 	"style": {
+				// 		"navigationBarTitleText": "直播列表",
+				// 		"navigationBarBackgroundColor": "#F2F2F2"
 
-					}
-				},
+				// 	}
+				// },
 				{
 					"path": "presell/index",
 					"style": {
@@ -1208,10 +1301,10 @@
 				"text": "首页"
 			},
 			// {
-			// 	"pagePath": "pages/goods_cate/goods_cate",
-			// 	"iconPath": "static/images/2-001.png",
-			// 	"selectedIconPath": "static/images/2-002.png",
-			// 	"text": "分类"
+			// 	"pagePath": "pages/store/shopStreet/index",
+			// 	"iconPath": "static/tabbar/tab-cart.png",
+			// 	"selectedIconPath": "static/tabbar/tab-cart-current.png",
+			// 	"text": "店铺街"
 			// },
 			// {
 			// 	"pagePath": "pages/plant_grass/index",
@@ -1221,8 +1314,8 @@
 			// },
 			{
 				"pagePath": "pages/order_addcart/order_addcart",
-				"iconPath": "static/tabbar/tab-cart.png",
-				"selectedIconPath": "static/tabbar/tab-cart-current.png",
+				"iconPath": "static/tabbar/cart-noaction.png",
+				"selectedIconPath": "static/tabbar/cart-action.png",
 				"text": "购物车"
 			},
 			{

pages/activity/assist_detail/index.vue

@@ -155,7 +155,7 @@
 		</view>
 		<!-- 发送给朋友图片 -->
 		<view class="share-box" v-if="H5ShareBox">
-			<image src="/static/images/share-info.png" @click="H5ShareBox = false"></image>
+			<image src="http://ygs.hqgjsmc.com/baseimg/share-info.png" @click="H5ShareBox = false"></image>
 		</view>
 		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
 		<home></home>

pages/activity/combination_details/index.vue

@@ -223,14 +223,14 @@
 			<view class='footer_count'>
 
 				<view class="acea-row row-between-wrapper footer">
-					<view v-if="storeInfo.merchant && storeInfo.merchant.services_type == 1" class="item skeleton-rect" @click="call">
+					<!-- <view v-if="storeInfo.merchant && storeInfo.merchant.services_type == 1" class="item skeleton-rect" @click="call">
 						<view class="iconfont icon-kefu"></view>
 						<view>客服</view>
 					</view>
 					<view v-else @click="goCustomer" class="item  skeleton-rect">
 						<view class="iconfont icon-kefu"></view>
 						<view>客服</view>
-					</view>
+					</view> -->
 
 					<view @click="setCollect" class='item  skeleton-rect'>
 						<view class='iconfont icon-shoucang1' v-if="storeInfo.isRelation"></view>
@@ -300,7 +300,7 @@
 			<canvas class="canvas" canvas-id='myCanvas' v-if="canvasStatus"></canvas>
 			<!-- 发送给朋友图片 -->
 			<view class="share-box" v-if="H5ShareBox">
-				<image src="/static/images/share-info.png" @click="H5ShareBox = false"></image>
+				<image src="http://ygs.hqgjsmc.com/baseimg/share-info.png" @click="H5ShareBox = false"></image>
 			</view>
 			<guaranteeTemplate ref="guartemplate" :guarantee='guarantee' :shipping='shipping'></guaranteeTemplate>
 			<!-- #ifndef H5 -->

pages/activity/combination_status/index.vue

@@ -101,7 +101,7 @@
 		<copyPassword :isCopy='isCopy' :copyUrl='copyUrl' @close="closeCopy"></copyPassword>
 		<!-- 发送给朋友图片 -->
 		<view class="share-box" v-if="H5ShareBox">
-			<image src="/static/images/share-info.png" @click="H5ShareBox = false"></image>
+			<image src="http://ygs.hqgjsmc.com/baseimg/share-info.png" @click="H5ShareBox = false"></image>
 		</view>
 		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
 		<!-- <Product-window v-on:changeFun="changeFun" :attr="attr" :limitNum='1' :iSbnt='1'></Product-window> -->

pages/activity/goods_seckill/index.vue

@@ -47,7 +47,7 @@
 		</view>
 		<view class='noCommodity' v-if="seckillList.length == 0 && (page != 1 || active== 0)">
 			<view class='pictrue'>
-				<image src='/static/images/noCart.png'></image>
+				<image src='http://ygs.hqgjsmc.com/baseimg/noCart.png'></image>
 				<view>暂无商品，去看点什么吧</view>
 			</view>
 		</view>

pages/activity/goods_seckill_details/index.vue

@@ -155,14 +155,14 @@
 				</scroll-view>
 			</view>
 			<view class='footer acea-row row-between-wrapper'>
-				<view v-if="storeInfo.merchant && storeInfo.merchant.services_type == 1" class="item skeleton-rect" @click="call">
+				<!-- <view v-if="storeInfo.merchant && storeInfo.merchant.services_type == 1" class="item skeleton-rect" @click="call">
 					<view class="iconfont icon-kefu"></view>
 					<view>客服</view>
 				</view>
 				<view v-else class="item skeleton-rect" @click="goCustomer">
 					<view class="iconfont icon-kefu"></view>
 					<view>客服</view>
-				</view>
+				</view> -->
 				<view @click="setCollect" class='item skeleton-rect'>
 					<view class='iconfont icon-shoucang1' v-if="storeInfo.isRelation"></view>
 					<view class='iconfont icon-shoucang' v-else></view>
@@ -233,7 +233,7 @@
 			<canvas class="canvas" canvas-id='myCanvas' v-if="canvasStatus"></canvas>
 			<!-- 发送给朋友图片 -->
 			<view class="share-box" v-if="H5ShareBox">
-				<image src="/static/images/share-info.png" @click="H5ShareBox = false"></image>
+				<image src="http://ygs.hqgjsmc.com/baseimg/share-info.png" @click="H5ShareBox = false"></image>
 			</view>
 			<guaranteeTemplate ref="guartemplate" :guarantee='guarantee' :shipping='shipping'></guaranteeTemplate>
 			<!-- #ifndef H5 -->

pages/activity/lifeService/index.vue

@@ -73,7 +73,7 @@
 				</view>
 				<view class='no-shop' v-if="!storeList.length && !loading && !loadingIcon" v-cloak>
 					<view class='pictrue' style="margin: 0 auto;">
-						<image src='../../../static/images/noCart.png'></image>
+						<image src='http://ygs.hqgjsmc.com/baseimg/noCart.png'></image>
 						<text>暂无店铺，快去搜索其他店铺吧</text>
 					</view>
 				</view>

pages/activity/presell_details/index.vue

@@ -202,14 +202,14 @@
 					<text>{{ presellInfo.delivery_type === 1 ? '   付尾款后' : '   活动结束后' }}{{ presellInfo.delivery_day }}天内发货</text>
 				</view>
 				<view class="acea-row row-between-wrapper footer" :class="presellInfo.presell_type === 2 ? 'noborder' : ''">
-					<view v-if="storeInfo.merchant && storeInfo.merchant.services_type == 1" class="item skeleton-rect" @click="call">
+					<!-- <view v-if="storeInfo.merchant && storeInfo.merchant.services_type == 1" class="item skeleton-rect" @click="call">
 						<view class="iconfont icon-kefu"></view>
 						<view>客服</view>
 					</view>
 					<view v-else @click="goCustomer" class="item skeleton-rect">
 						<view class="iconfont icon-kefu"></view>
 						<view>客服</view>
-					</view>
+					</view> -->
 					<view @click="setCollect" class='item skeleton-rect'>
 						<view class='iconfont icon-shoucang1' v-if="storeInfo.isRelation"></view>
 						<view class='iconfont icon-shoucang' v-else></view>
@@ -283,7 +283,7 @@
 			<canvas class="canvas" canvas-id='myCanvas' v-if="canvasStatus"></canvas>
 			<!-- 发送给朋友图片 -->
 			<view class="share-box" v-if="H5ShareBox">
-				<image src="/static/images/share-info.png" @click="H5ShareBox = false"></image>
+				<image src="http://ygs.hqgjsmc.com/baseimg/share-info.png" @click="H5ShareBox = false"></image>
 			</view>
 			<guaranteeTemplate ref="guartemplate" :guarantee='guarantee' :shipping='shipping'></guaranteeTemplate>
 			<!-- #ifndef H5 -->

pages/admin/orderList/index.vue

@@ -124,7 +124,7 @@
 			</view>
 			<Loading :loaded="loaded" :loading="loading"></Loading>
 		<view v-if="!loading && list.length <= 0" class="nothing">
-			<image src="/static/images/no_thing.png" mode="widthFix"></image>
+			<image src="http://ygs.hqgjsmc.com/baseimg/no_thing.png" mode="widthFix"></image>
 			<view class="nothing_text">暂无订单~</view>
 		</view>
 		<PriceChange :change="change" :orderInfo="orderInfo" v-on:closechange="changeclose($event)" v-on:savePrice="savePrice"

pages/columnGoods/goods_list/index.vue

@@ -76,7 +76,7 @@
 				</view>
 				<view class='noCommodity' v-if="productList.length==0 && where.page > 1">
 					<view class='pictrue' style="margin: 60rpx auto;">
-						<image src='/static/images/noCart.png'></image>
+						<image src='http://ygs.hqgjsmc.com/baseimg/noCart.png'></image>
 						<view>暂无商品，去看点什么吧</view>
 					</view>
 					<recommend :hostProduct="hostProduct" :isLogin="isLogin"></recommend>

pages/columnGoods/goods_search_con/index.vue

@@ -114,7 +114,7 @@
 				</view>
 				<view class='noCommodity' v-if="productList.length==0 && !loading">
 					<view class='pictrue' style="margin: 0 auto;">
-						<image src='/static/images/noCart.png'></image>
+						<image src='http://ygs.hqgjsmc.com/baseimg/noCart.png'></image>
 						<text>暂无商品，快去搜索其他商品吧</text>
 					</view>
 					<recommend :hostProduct="hostProduct" :isLogin="isLogin"></recommend>

pages/goods_details/index.vue

@@ -235,7 +235,7 @@
 							<button v-if="storeInfo.type != 1" class='joinCart bnts' form-type="submit">加入购物车</button>
 						</form>
 						<form @submit="goBuy" report-submit='true' v-if="attr.productSelect">
-							<button class='buy bnts' :class="{ 'virtual_buy' : storeInfo.type == 1,'xfjf':(storeInfo.is_integral == 1 || storeInfo.is_consumption == 1)}" form-type="submit" :disabled="attr.productSelect.stock == 0">立即购买</button>
+							<button class='buy bnts' :class="{ 'virtual_buy' : storeInfo.type == 1,'xfjf':(storeInfo.is_integral == 1 || storeInfo.is_consumption == 1 )}" form-type="submit" :disabled="attr.productSelect.stock == 0">立即购买</button>
 						</form>
 					
 				</view>
@@ -305,7 +305,7 @@
 			<canvas class="canvas" canvas-id='myCanvas' v-if="canvasStatus"></canvas>
 			<!-- 发送给朋友图片 -->
 			<view class="share-box" v-if="H5ShareBox">
-				<image src="/static/images/share-info.png" @click="H5ShareBox = false"></image>
+				<image src="http://ygs.hqgjsmc.com/baseimg/share-info.png" @click="H5ShareBox = false"></image>
 			</view>
 			<guaranteeTemplate ref="guartemplate" :guarantee='guarantee' :shipping='shipping'></guaranteeTemplate>
 			<!-- #ifndef H5 -->
@@ -1180,7 +1180,7 @@
 						that.isOpen = that.attr.cartAttr = false;
 						if (news) {
 							uni.navigateTo({
-								url: '/pages/users/order_confirm/index?cartId=' + res.data.cart_id + '&is_xfq=' + that.storeInfo.is_consumption + '&is_jf=' + that.storeInfo.is_integral
+								url: '/pages/users/order_confirm/index?cartId=' + res.data.cart_id + '&is_xfq=' + that.storeInfo.is_consumption + '&is_jf=' + that.storeInfo.is_integral + '&is_jk=' + that.storeInfo.is_healthy
 							});
 						} else {
 							that.$util.Tips({

pages/index/bdzq.vue

@@ -10,7 +10,7 @@
 			<view class="header">积分专区</view>
 		</view>
 		<view class="top-bg flex">
-			<image src="../../static/img/bd-mbg.png" mode=""></image>
+			<image src="http://ygs.hqgjsmc.com/baseimg/bd-mbg.png" mode=""></image>
 		</view>
 		<view class="bastgood-box">
 			<view class="bg-bg">

pages/index/component/pictureCube.vue

@@ -123,7 +123,12 @@
 					if (['/pages/goods_cate/goods_cate', '/pages/order_addcart/order_addcart', '/pages/user/index']
 						.indexOf(urls) == -1) {
 						uni.navigateTo({
-							url: urls
+							url: urls,
+							fail() {
+								uni.switchTab({
+									url:urls
+								})
+							}
 						})
 					} else {
 						uni.reLaunch({

pages/index/component/swiperBg.vue

@@ -7,7 +7,7 @@
 		</block>
 		<block v-else>
 			<view class="swiper page_swiper" :class="[docConfig == 1 ? 'square' : docConfig == 0 ? 'circular' : 'nodoc',imgConfig?'':'fillet','dot'+txtStyle]" 
-			:style="'background: linear-gradient(180deg, '+ bgColor0 +' 50%, '+ bgColor1 +' 100%);'"
+			:style="'padding: 0 '+ paddinglr +'rpx;background: linear-gradient(180deg, '+ bgColor0 +' 50%, '+ bgColor1 +' 100%);'"
 			 v-if="imgUrls.length">
 				<swiper
 				indicator-dots="true" 
@@ -97,8 +97,8 @@
 			setDomain: function(url) {
 				url = url ? url.toString() : '';
 				//本地调试打开,生产请注销
-				if (url.indexOf("https://") > -1) return url;
-				else return url.replace('http://', 'https://');
+				// if (url.indexOf("https://") > -1) return url;
+				// else return url.replace('http://', 'https://');
 			},
 			swiperChange(e) {
 				let { current, source } = e.detail;
@@ -147,7 +147,7 @@
 			width: 100%;
 			height: auto;
 			margin: 0 auto;
-			// border-radius: 10rpx;
+			border-radius: 10rpx;
 			overflow-x: hidden;
 			/* #ifdef MP */
 			z-index: 20;
@@ -166,8 +166,7 @@
 			}
 			swiper{
 				width: 100%;
-				display: block;
-				background-color: #478fbf;
+				display: block;
 			}
 			image {
 				transform: scale(0.93);

pages/index/down.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<div class="div">
-			<img class="img" src="../../static/img/hqyg.png" />
+			<img class="img" src="http://ygs.hqgjsmc.com/baseimg/hqyg.png" />
 			<!-- <a href="#" id="donwa" > -->
 			<div class="button" @click="goDown">Android版本下载</div>
 			<!-- </a> -->
@@ -9,7 +9,7 @@
 		<!-- <image src="../../static/img/live_weixin.png" alt="微信打开" style="width: 750rpx;"/> -->
 		<div class="weixin-tip" :style="{'display':iswx?'block':'none'}">
 			<p>
-				<img src="../../static/img/live_weixin.png" alt="微信打开" />
+				<img src="http://ygs.hqgjsmc.com/baseimg/live_weixin.png" alt="微信打开" />
 			</p>
 		</div>
 	</view>

pages/index/jkzq.vue

@@ -0,0 +1,270 @@
+<template>
+	<view class="content">
+		<!-- #ifdef APP-PLUS -->
+		<view class="status_bar"></view>
+		<!-- #endif -->
+		<view class="body-title">
+			<view class="goback-box" @click="toBack">
+				<image class="goback" src="../../static/icon/fanhui.png" mode=""></image>
+			</view>
+			<view class="header">健康专区</view>
+		</view>
+		<view class="top-bg flex">
+			<image src="http://ygs.hqgjsmc.com/baseimg/bd-mbg.png" mode=""></image>
+		</view>
+		<view class="bastgood-box">
+			<view class="bg-bg">
+
+			</view>
+			<view v-for="(item, index) in list" :key="item.product_id" class="guess-item" @click.stop="navTo('/pages/goods_details/index?id=' + item.product_id)">
+				<image :src="item.image"></image>
+				<view class="guess-box">
+					<view class="title clamp2">{{item.store_info}}</view>
+					<view class="info">
+						<view class="price-box flex">
+							<image src="../../static/icon/xfq.png" mode="widthFix"></image>
+							<!-- <view class="jiang">赠送积分{{item.give_integral*1}}个</view> -->
+							<view class="jiang">赠送积分</view>
+						</view>
+						<view class="price">￥{{ item.price*1 }}
+							<view class="yuanprice">￥{{item.ot_price*1}}</view>
+						</view>
+					</view>
+
+					<view class="btn" >
+						立即购买</view>
+				</view>
+			</view>
+			<!-- <uni-load-more :status="loadingType"></uni-load-more> -->
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getJkList
+	} from '@/api/activity.js'
+	export default {
+		data() {
+			return {
+				page: 1,
+				limit: 10,
+				list: [],
+				loadingType: 'more'
+			}
+		},
+		onLoad() {
+			this.getProducts()
+		},
+		onShow() {
+
+		},
+		onReachBottom() {
+			this.getProducts()
+		},
+		onReady() {
+
+		},
+		methods: {
+			navTo(url) {
+				uni.navigateTo({
+					url
+				})
+			},
+			toBack() {
+				uni.switchTab({
+					url: '/pages/index/index'
+				})
+			},
+			getProducts() {
+				let obj = this
+				if (obj.loadingType == 'noMore' || obj.loadingType == 'loading') {
+					return
+				}
+				obj.loadingType = 'loading'
+				getJkList({
+					page: obj.page,
+					limit: obj.limit
+				}).then(res => {
+					console.log(res)
+					obj.list = obj.list.concat(res.data.list)
+					obj.page++
+					if (obj.limit == res.data.length) {
+						obj.loadingType = 'more'
+					} else {
+						obj.loadingType = 'noMore'
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background: #fff;
+		height: auto;
+		min-height: 100%;
+	}
+
+	.status_bar {
+		height: var(--status-bar-height);
+		width: 100%;
+		background: #ff6100;
+	}
+
+	.body-title {
+		height: 80rpx;
+		text-align: center;
+		font-size: 35rpx;
+		background-color: #ff6100;
+		position: relative;
+
+		.header {
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #fffeff;
+			height: 80rpx;
+			font-size: 36rpx;
+			font-weight: 700;
+			z-index: 9;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+
+		.goback-box {
+			position: absolute;
+			left: 18rpx;
+			top: 0;
+			height: 80rpx;
+			display: flex;
+			align-items: center;
+		}
+
+		.goback {
+			z-index: 100;
+			width: 34rpx;
+			height: 34rpx;
+		}
+	}
+
+	.top-bg {
+		background: #ff6100;
+		justify-content: center;
+		align-items: center;
+		padding: 30rpx 0;
+
+		image {
+			width: 700rpx;
+			height: 350rpx;
+			border-radius: 20rpx;
+
+		}
+	}
+
+	.bastgood-box {
+		background-color: #ffffff;
+		position: relative;
+
+		.bg-bg {
+			position: absolute;
+			height: 380rpx;
+			width: 750rpx;
+			top: 0;
+			left: 0;
+			background: linear-gradient(180deg, #ff6100, #fff);
+		}
+
+		.guess-item {
+			display: flex;
+			width: 710rpx;
+			background: #ffffff;
+			box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+			border-radius: 10rpx;
+			padding: 15rpx;
+			margin: 0rpx auto 20rpx;
+			position: relative;
+
+			image {
+				width: 236rpx;
+				height: 236rpx;
+				border-radius: 10rpx;
+			}
+
+			.guess-box {
+				padding: 12rpx 0 15rpx 24rpx;
+				width: 436rpx;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+
+				.title {
+					font-size: 32rpx;
+					padding-left: 4rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #333333;
+					width: 368rpx;
+					line-height: 36rpx;
+				}
+
+				.price-box {
+					// margin-top: 76rpx;
+					justify-content: flex-start;
+
+					image {
+						width: 28rpx;
+					}
+
+					.jiang {
+						padding-left: 4rpx;
+						font-size: 24rpx;
+						font-family: PingFang SC;
+						font-weight: bold;
+						color: #b59467;
+					}
+				}
+
+				.price {
+					font-size: 36rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #ff1135;
+					display: flex;
+					align-items: center;
+
+					.yuanprice {
+						font-size: 26rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						text-decoration: line-through;
+						color: #999999;
+						padding-left: 6rpx;
+					}
+				}
+
+				.btn {
+					width: 138rpx;
+					height: 52rpx;
+					background: #ff4c4c;
+					border-radius: 26rpx;
+					font-size: 26rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #ffffff;
+					line-height: 52rpx;
+					text-align: center;
+					position: absolute;
+					bottom: 25rpx;
+					right: 25rpx;
+				}
+			}
+		}
+	}
+</style>

pages/index/xfqzq.vue

@@ -10,7 +10,7 @@
 			<view class="header">消费券专区</view>
 		</view>
 		<view class="top-bg flex">
-			<image src="../../static/img/xf-mbg.png" mode=""></image>
+			<image src="http://ygs.hqgjsmc.com/baseimg/xf-mbg.png" mode=""></image>
 		</view>
 		<view class="bastgood-box">
 			<view class="bg-bg"></view>

pages/order_addcart/order_addcart.vue

@@ -82,7 +82,7 @@
 			</view>
 			<view class='noCart' v-if="recommend" :style="{marginTop:cartList.invalid.length ==0 && cartList.invalid.length ==0?'170rpx':'' }">
 				<view class='pictrue'>
-					<image src='../../static/images/noCart.png'></image>
+					<image src='http://ygs.hqgjsmc.com/baseimg/noCart.png'></image>
 					<view>暂无商品，去添加点什么吧</view>
 				</view>
 			

pages/plantGrass/components/associated.vue

@@ -33,7 +33,7 @@
 						</view>
 					</view>
 					<view v-else class="empty">
-						<image src="/static/images/no_thing.png"></image>
+						<image src="http://ygs.hqgjsmc.com/baseimg/no_thing.png"></image>
 						<text>暂无内容哦~</text>
 					</view>
 				</block>
@@ -56,7 +56,7 @@
 						</view>
 					</view>
 					<view v-else class="empty">
-						<image src="/static/images/no_thing.png"></image>
+						<image src="http://ygs.hqgjsmc.com/baseimg/no_thing.png"></image>
 						<text>暂无内容哦~</text>
 					</view>
 				</block>
@@ -79,7 +79,7 @@
 						</view>
 					</view>
 					<view v-else class="empty">
-						<image src="/static/images/no_thing.png"></image>
+						<image src="http://ygs.hqgjsmc.com/baseimg/no_thing.png"></image>
 						<text>暂无内容哦~</text>
 					</view>
 				</block>

pages/plantGrass/plant_detail/index.vue

@@ -128,7 +128,7 @@
 						</view>
 					</block>
 					<view v-if="commList.length == 0 && !loading" class="empty">
-						<image src="/static/images/no_commen.png"></image>
+						<image src="http://ygs.hqgjsmc.com/baseimg/no_commen.png"></image>
 						<text>暂无评论，快去抢沙发吧~</text>
 					</view>
 					<view class="release_bar acea-row">

pages/plantGrass/plant_user/index.vue

@@ -49,7 +49,7 @@
 					</view>
 				</view>
 				<view v-if="goods.length == 0 && !loading" class="empty">
-					<image src="/static/images/no_thing.png"></image>
+					<image src="http://ygs.hqgjsmc.com/baseimg/no_thing.png"></image>
 					<text>暂无内容哦~</text>
 				</view>
 				<view class='loadingicon acea-row row-center-wrapper'>

pages/plant_grass/index.vue

@@ -104,11 +104,11 @@
 							</block>
 						</view>
 						<view v-if="followList.length == 0 && !focusLoading && isLogin" class="empty">
-							<image src="/static/images/no_thing.png"></image>
+							<image src="http://ygs.hqgjsmc.com/baseimg/no_thing.png"></image>
 							<text>暂无内容~</text>
 						</view>
 						<view v-if="!isLogin" class="empty no_login">
-							<image src="/static/images/no_login.png"></image>
+							<image src="http://ygs.hqgjsmc.com/baseimg/no_login.png"></image>
 							<view class="title">暂未登录</view>
 							<text>登录后可查看关注用户的发布哦~</text>
 							<button class="login_btn" @click="authOpen">立即登录</button>

pages/store/applicationRecord/index.vue

@@ -21,7 +21,7 @@
 		</view>
 		<view class='no-shop' v-if="!listData.length && !loading">
 			<view class='pictrue' style="margin: 0 auto;">
-				<image src='/static/images/noCart.png'></image>
+				<image src='http://ygs.hqgjsmc.com/baseimg/noCart.png'></image>
 				<text>暂无申请记录，快去申请入驻吧!</text>
 			</view>
 		</view>

pages/store/detail/index.vue

@@ -32,15 +32,15 @@
 				<view><text class="iconfont">&#xe743;</text></view>
 			</navigator>		
 			
-			<view v-if="store.services_type == 1" class="section wrap" @click="call">
+			<!-- <view v-if="store.services_type == 1" class="section wrap" @click="call">
 				<view class="name">联系客服</view>
 				<view><text class="iconfont icon-kefu1"></text></view>					
-			</view>
+			</view> -->
 			
-			<navigator v-else :url="`/pages/chat/customer_list/chat?mer_id=${store.mer_id}&uid=${this.uid}`" class="section wrap">
+			<!-- <navigator v-else :url="`/pages/chat/customer_list/chat?mer_id=${store.mer_id}&uid=${this.uid}`" class="section wrap">
 				<view class="name">联系客服</view>
 				<view><text class="iconfont icon-kefu1"></text></view>
-			</navigator>
+			</navigator> -->
 		
 			<view class="section info">
 				<view class="item very">

pages/store/list/index.vue

@@ -89,7 +89,7 @@
 				</view>
 				<view class='noCommodity' v-if="productList.length==0 && where.page > 1">
 					<view class='pictrue'>
-						<image src='/static/images/noCart.png'></image>
+						<image src='http://ygs.hqgjsmc.com/baseimg/noCart.png'></image>
 						<view>暂无商品，去看点什么吧</view>
 					</view>
 					<recommend :hostProduct="hostProduct"></recommend>

pages/store/shopStreet/index.vue

@@ -153,7 +153,7 @@
 				</view>
 				<view class='no-shop' v-if="!storeList.length && !loading && !loadingIcon" v-cloak>
 					<view class='pictrue' style="margin: 0 auto;">
-						<image src='../../../static/images/noCart.png'></image>
+						<image src='http://ygs.hqgjsmc.com/baseimg/noCart.png'></image>
 						<text>暂无店铺，快去搜索其他店铺吧</text>
 					</view>
 				</view>

pages/user/index.vue

@@ -1,66 +1,139 @@
 <template>
 	<view class="container">
+		<!-- #ifdef H5 -->
 		<view class="vheigh"></view>
-		<view class="top-image"><image src="../../static/user/user-top.png" mode=""></image></view>
-		<view class="user-set flex">
-			<view class="set-logo"><!-- <image src="../../static/user/user1.png" mode=""></image> --></view>
-			<!-- <view class="xx-logo"><image src="../../static/user/user2.png" mode=""></image></view> -->
-		</view>
-		<view class="user-wrap">
-			<view class="info-left flex">
-				<view class="user-name">
-					<image :src="userInfo.avatar" mode="" v-if="userInfo.avatar"></image>
-					<image src="../../static/error/missing-face.png" mode="" v-else></image>
-					<view class="user-font">
-						<view class="name clamp">{{ userInfo.nickname }}</view>
-						<view class="name clamp" @click="navto('/pages/users/login/index')" v-if="!userInfo.nickname ">登录</view>
-						<view class="phone">{{ userInfo.phone }}</view>
-						<view class="phone" v-if="userInfo.uid">邀请码：{{ userInfo.uid }}</view>
+		<!-- #endif -->
+
+		<view class="user-info">
+			<image src="http://ygs.hqgjsmc.com/baseimg/u-bg.png" mode="" class="user-info-bg"></image>
+			<!-- #ifndef MP-WEIXIN -->
+			<view class="user-info-tit">
+				个人中心
+			</view>
+			<!-- #endif -->
+
+			<image src="../../static/user/u-set.png" mode="" class="u-set"
+				@click.stop="navto('/pages/users/user_info/index')"></image>
+			<view class="user-wrap">
+				<view class="info-left flex">
+					<view class="user-name">
+						<image :src="userInfo.avatar" mode="" v-if="userInfo.avatar"></image>
+						<image src="../../static/error/missing-face.png" mode="" v-else></image>
+						<view class="user-font">
+							<view class="name clamp">{{ userInfo.nickname }}</view>
+							<view class="name clamp" @click="navto('/pages/users/login/index')"
+								v-if="!userInfo.nickname ">登录</view>
+							<view class="phone">{{ userInfo.phone | phone }}</view>
+							<view class="yqm" v-if="userInfo.uid"><text class="yqm-left">邀请码</text>{{ userInfo.uid }}
+							</view>
+						</view>
+					</view>
+					<view class="kpi" v-if="userInfo && userInfo.level">
+						<image src="http://ygs.hqgjsmc.com/baseimg/menber-bg.png" mode=""></image>
+						<view class="user-level">V{{ userInfo.level }}会员</view>
 					</view>
 				</view>
-				<view class="kpi" v-if="userInfo && userInfo.level">
-					<image src="../../static/img/menber-bg.png" mode=""></image>
-					<view class="user-level">V{{ userInfo.level }}会员</view>
+
+				<!-- <view class="flex">
+					<view class="info-right" @click="authTo('/pages/users/user_money/index')">
+						<image class="iright-icon" src="../../static/user/user3.png" mode=""></image>
+						<view class="iright-font">钱包余额：{{ userInfo.now_money || 0 }}</view>
+					</view>
+					<view class="info-right" @click="authTo('/pages/users/user_payment/index')">
+						<image class="iright-icon" src="../../static/user/user3.png" mode=""></image>
+						<view class="iright-font">充值钱包</view>
+					</view>
+				</view> -->
+			</view>
+		</view>
+		<view class="u-ye flex">
+			<view class="info-right" @click="authTo('/pages/users/user_money/index')">
+				<image class="iright-icon" src="../../static/user/u-ye.png" mode="widthFix"></image>
+				<view class="iright-font">余额：{{ userInfo.now_money || 0 }}</view>
+			</view>
+			<view class="" style="width: 4rpx;height: 35rpx;background: #FFFFFF;">
+
+			</view>
+			<view class="info-right" @click="authTo('/pages/users/user_payment/index')">
+				<image class="iright-icon" src="../../static/user/u-cz.png" mode="widthFix"></image>
+				<view class="iright-font">充值</view>
+			</view>
+		</view>
+		<view class="u-up" @click="navto('/pages/store/settled/index')">
+			<image src="../../static/user/u-up.png" mode="" class="u-up-bg"></image>
+			<view class="u-up-tit">
+				申请成为供应商享受更多福利
+			</view>
+			<view class="u-up-btn">
+				去申请
+			</view>
+		</view>
+		<view class="main-box">
+			<view class="title flex">
+				<view class="title-left">
+					<view class="title-font">易博健康</view>
 				</view>
 			</view>
-			<view class="flex">
-				<view class="info-right" @click="authTo('/pages/users/user_money/index')">
-					<image class="iright-icon" src="../../static/user/user3.png" mode=""></image>
-					<view class="iright-font">钱包余额：{{ userInfo.now_money || 0 }}</view>
+			<view class="main flex">
+				<view class="item" @click="authTo('/pages/user/qyjf')">
+					<image src="../../static/user/u-qy.png" mode="heightFix" class="item-img"></image>
+					<view class="item-font">权益积分</view>
+					<view class="item-num">{{ userInfo.healthy_integral * 1 || 0 }}</view>
 				</view>
-				<view class="info-right" @click="authTo('/pages/users/user_payment/index')">
-					<image class="iright-icon" src="../../static/user/user3.png" mode=""></image>
-					<view class="iright-font">充值钱包</view>
+
+				<view class="item" @click="authTo('/pages/user/qyjf')">
+					<image src="../../static/user/u-dsf.png" mode="heightFix" class="item-img"></image>
+
+					<view class="item-font">待释放</view>
+					<view class="item-num">{{ dsf * 1 || 0 }}</view>
+				</view>
+
+				<view class="item" @click="authTo('/pages/user/qyjf')">
+					<image src="../../static/user/u-sr.png" mode="heightFix" class="item-img"></image>
+
+					<view class="item-font">累计收入</view>
+					<view class="item-num">{{ sr * 1 || 0 }}</view>
+				</view>
+
+				<view class="item" @click="authTo('/pages/user/qyjf')">
+					<image src="../../static/user/u-zc.png" mode="heightFix" class="item-img"></image>
+
+					<view class="item-font">累计支出</view>
+					<view class="item-num">{{ zc * 1 || 0 }}</view>
 				</view>
+
 			</view>
 		</view>
 		<view class="main-box">
 			<view class="title flex">
 				<view class="title-left">
-					<!-- <image class="title-icon" src="../../static/user/user4.png" mode=""></image> -->
-					<view class="title-font">我的资产</view>
+					<view class="title-font">环球优购</view>
 				</view>
-				<!-- <image class="title-right" src="../../static/img/back.png" mode=""></image> -->
 			</view>
 			<view class="main flex">
 				<view class="item" @click="authTo('/pages/user/myjf')">
-					<view class="item-num">{{ userInfo.dynamic_integral * 1 || 0 }}</view>
+					<image src="../../static/user/u-djf.png" mode="heightFix" class="item-img"></image>
 					<view class="item-font">动态积分</view>
+					<view class="item-num">{{ userInfo.dynamic_integral * 1 || 0 }}</view>
 				</view>
-				<view class="jg"></view>
+
 				<view class="item" @click="authTo('/pages/user/mygwjf')">
-					<view class="item-num">{{ userInfo.integral * 1 || 0 }}</view>
+					<image src="../../static/user/u-jjf.png" mode="heightFix" class="item-img"></image>
 					<view class="item-font">静态积分</view>
+					<view class="item-num">{{ userInfo.integral * 1 || 0 }}</view>
 				</view>
-				<view class="jg"></view>
+
 				<view class="item" @click="authTo('/pages/user/mythq')">
-					<view class="item-num">{{ userInfo.consumption * 1 || 0 }}</view>
+					<image src="../../static/user/u-xfq.png" mode="heightFix" class="item-img"></image>
+
 					<view class="item-font">消费券</view>
+					<view class="item-num">{{ userInfo.consumption * 1 || 0 }}</view>
 				</view>
-				<view class="jg"></view>
 				<view class="item" @click="authTo('/pages/user/myggz')">
-					<view class="item-num">{{ userInfo.contribution * 1 || 0 }}</view>
+					<image src="../../static/user/u-gxz.png" mode="heightFix" class="item-img"></image>
+
 					<view class="item-font">贡献值</view>
+					<view class="item-num">{{ userInfo.contribution * 1 || 0 }}</view>
 				</view>
 			</view>
 		</view>
@@ -97,32 +170,48 @@
 				<!-- <image src="../../static/img/xiangxia.png" mode="scaleToFill"></image> -->
 			</view>
 			<view class="tool flex">
+				<!-- #ifndef APP-PLUS -->
 				<view class="tool-item" @click="authTo('/pages/users/promoter-list/index')">
-					<view class="tool-img"><image src="../../static/icon/gn1.png" mode=""></image></view>
+					<view class="tool-img">
+						<image src="../../static/icon/gn1.png" mode=""></image>
+					</view>
 					<view class="tool-name">我的推广</view>
 				</view>
+				<!-- #endif -->
 				<view class="tool-item" @click="authTo('/pages/users/user_spread_code/index')">
-					<view class="tool-img"><image src="../../static/icon/gn2.png" mode=""></image></view>
+					<view class="tool-img">
+						<image src="../../static/icon/gn2.png" mode=""></image>
+					</view>
 					<view class="tool-name">邀请有礼</view>
 				</view>
 				<view class="tool-item" @click="authTo('/pages/users/user_goods_collection/index')">
-					<view class="tool-img"><image src="../../static/icon/gn3.png" mode=""></image></view>
+					<view class="tool-img">
+						<image src="../../static/icon/gn3.png" mode=""></image>
+					</view>
 					<view class="tool-name">我的收藏</view>
 				</view>
 				<view class="tool-item" @click="authTo('/pages/users/retrievePassword/index')">
-					<view class="tool-img"><image src="../../static/icon/i8.png" mode=""></image></view>
+					<view class="tool-img">
+						<image src="../../static/icon/i8.png" mode=""></image>
+					</view>
 					<view class="tool-name">修改密码</view>
 				</view>
 				<view class="tool-item" @click="openKf()">
-					<view class="tool-img"><image src="../../static/icon/gn5.png" mode=""></image></view>
+					<view class="tool-img">
+						<image src="../../static/icon/gn5.png" mode=""></image>
+					</view>
 					<view class="tool-name">客服中心</view>
 				</view>
 				<view class="tool-item" @click="authTo('/pages/users/user_address_list/index')">
-					<view class="tool-img"><image src="../../static/icon/gn6.png" mode=""></image></view>
+					<view class="tool-img">
+						<image src="../../static/icon/gn6.png" mode=""></image>
+					</view>
 					<view class="tool-name">收货地址</view>
 				</view>
 				<view class="tool-item" @click="authTo('/pages/users/user_info/index')">
-					<view class="tool-img"><image src="../../static/icon/gn7.png" mode=""></image></view>
+					<view class="tool-img">
+						<image src="../../static/icon/gn7.png" mode=""></image>
+					</view>
 					<view class="tool-name">设置</view>
 				</view>
 			</view>
@@ -130,13 +219,16 @@
 		<view class="" style="height: 100rpx;"></view>
 		<uni-popup ref="popupkf" type="center">
 			<view class="popup-box">
-				<view class="img"><image src="../../static/img/img009.png" mode=""></image></view>
+				<view class="img">
+					<image src="http://ygs.hqgjsmc.com/baseimg/img009.png" mode=""></image>
+				</view>
 				<view class="mian">
 					<view class="delivery">
 						<view class="title">已经为您定制专属客服</view>
-						<image src="../../static/img/img010.png" mode=""></image>
+						<image src="http://ygs.hqgjsmc.com/baseimg/img010.png" mode=""></image>
 					</view>
-					<view class="nocancel">客服VX:{{ text }}</view>
+					<view class="nocancel" @click.stop="makePhone">联系电话：{{ lxphone }}</view>
+					<view class="nocancel">客服VX：{{ text }}</view>
 					<view class="comfirm-box">
 						<view class="cancel" @click="cancel">取消</view>
 						<view class="comfirm" @click="comfirm(text)">复制微信</view>
@@ -144,822 +236,1106 @@
 				</view>
 			</view>
 		</uni-popup>
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse" :isGoIndex="false"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"
+			:isGoIndex="false"></authorize> -->
+		<authorize :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse" @onLoadFun="onLoadFun"></authorize>
 		<!-- #ifndef H5 -->
 		<passwordPopup></passwordPopup>
 		<!-- #endif -->
 	</view>
 </template>
 <script>
-import { getMenuList, getUserInfo, setVisit } from '@/api/user.js';
-import { orderData } from '@/api/order.js';
-import { mapGetters, mapMutations } from 'vuex';
-import authorize from '@/components/Authorize';
-// #ifndef H5
-import passwordPopup from '@/components/passwordPopup';
-// #endif
-import { configMap } from '@/utils';
-import Auth from '../../libs/wechat';
-import { HTTP_REQUEST_URL } from '@/config/app';
-const app = getApp();
-export default {
-	components: {
-		// #ifndef H5
-		passwordPopup,
-		// #endif
-		authorize
-	},
-	computed: configMap(
-		{
-			mer_intention_open: 0,
-			hide_mer_status: 1,
-			recharge_switch: 0,
-			integral_status: 0,
-			member_status: 0,
-			balance_func_status: 0,
-			copyright_status: '',
-			copyright_image: '',
-			copyright_context: ''
+	import {
+		userBalance,
+		healthyIntegrallist
+	} from '@/api/wallet.js';
+	import {
+		getMenuList,
+		getUserInfo,
+		setVisit
+	} from '@/api/user.js';
+	import {
+		orderData
+	} from '@/api/order.js';
+	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex';
+	import authorize from '@/components/Authorize';
+	// #ifndef H5
+	import passwordPopup from '@/components/passwordPopup';
+	// #endif
+	import {
+		configMap
+	} from '@/utils';
+	import Auth from '../../libs/wechat';
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
+	const app = getApp();
+	export default {
+		components: {
+			// #ifndef H5
+			passwordPopup,
+			// #endif
+			authorize
 		},
-		mapGetters(['isLogin', 'viewColor', 'keyColor'])
-	),
-	data() {
-		return {
-			text: '15606861277', //客服微信
-			domain: HTTP_REQUEST_URL,
-			showSkeleton: true, //骨架屏显示隐藏
-			isNodes: 0, //控制什么时候开始抓取元素节点,只要数值改变就重新抓取
-			orderMenu: [
-				{
-					img: '/static/diy/order1',
-					title: '待付款',
-					url: '/pages/users/order_list/index?status=0',
-					num: 0
-				},
-				{
-					img: '/static/diy/order2',
-					title: '待发货',
-					url: '/pages/users/order_list/index?status=1',
-					num: 0
-				},
-				{
-					img: '/static/diy/order3',
-					title: '待收货',
-					url: '/pages/users/order_list/index?status=2',
-					num: 0
-				},
-				{
-					img: '/static/diy/order4',
-					title: '待评价',
-					url: '/pages/users/order_list/index?status=3',
-					num: 0
+		computed: configMap({
+				mer_intention_open: 0,
+				hide_mer_status: 1,
+				recharge_switch: 0,
+				integral_status: 0,
+				member_status: 0,
+				balance_func_status: 0,
+				copyright_status: '',
+				copyright_image: '',
+				copyright_context: ''
+			},
+			mapGetters(['isLogin', 'viewColor', 'keyColor'])
+		),
+		data() {
+			return {
+				lxphone: '0575-87601131',
+				text: 'yibo2709', //客服微信
+				domain: HTTP_REQUEST_URL,
+				showSkeleton: true, //骨架屏显示隐藏
+				isNodes: 0, //控制什么时候开始抓取元素节点,只要数值改变就重新抓取
+				orderMenu: [{
+						img: '/static/diy/order1',
+						title: '待付款',
+						url: '/pages/users/order_list/index?status=0',
+						num: 0
+					},
+					{
+						img: '/static/diy/order2',
+						title: '待发货',
+						url: '/pages/users/order_list/index?status=1',
+						num: 0
+					},
+					{
+						img: '/static/diy/order3',
+						title: '待收货',
+						url: '/pages/users/order_list/index?status=2',
+						num: 0
+					},
+					{
+						img: '/static/diy/order4',
+						title: '待评价',
+						url: '/pages/users/order_list/index?status=3',
+						num: 0
+					},
+					{
+						img: '/static/diy/order5',
+						title: '售后/退款',
+						url: '/pages/users/refund/list',
+						num: 0
+					}
+				],
+				imgUrls: [{
+					url: '',
+					pic: ''
+				}],
+				userMenu: [],
+				skeletonMenu: [],
+				personalMenu: [{
+						pic: '',
+						name: '',
+						isShow: true
+					},
+					{
+						pic: '',
+						name: '',
+						isShow: true
+					},
+					{
+						pic: '',
+						name: '',
+						isShow: true
+					},
+					{
+						pic: '',
+						name: '',
+						isShow: true
+					},
+					{
+						pic: '',
+						name: '',
+						isShow: true
+					},
+					{
+						pic: '',
+						name: '',
+						isShow: true
+					},
+					{
+						pic: '',
+						name: '',
+						isShow: true
+					},
+					{
+						pic: '',
+						name: '',
+						isShow: true
+					},
+					{
+						pic: '',
+						name: '',
+						isShow: true
+					},
+					{
+						pic: '',
+						name: '',
+						isShow: true
+					},
+					{
+						pic: '',
+						name: '',
+						isShow: true
+					},
+					{
+						pic: '',
+						name: '',
+						isShow: true
+					}
+				],
+				autoplay: true,
+				circular: true,
+				interval: 3000,
+				duration: 500,
+				isAuto: false, //没有授权的不会自动授权
+				isShowAuth: false, //是否隐藏授权
+				orderStatusNum: {},
+				userInfo: {
+					aratar: '/static/f.png'
 				},
-				{
-					img: '/static/diy/order5',
-					title: '售后/退款',
-					url: '/pages/users/refund/list',
-					num: 0
-				}
-			],
-			imgUrls: [{ url: '', pic: '' }],
-			userMenu: [],
-			skeletonMenu: [],
-			personalMenu: [
-				{ pic: '', name: '', isShow: true },
-				{ pic: '', name: '', isShow: true },
-				{ pic: '', name: '', isShow: true },
-				{ pic: '', name: '', isShow: true },
-				{ pic: '', name: '', isShow: true },
-				{ pic: '', name: '', isShow: true },
-				{ pic: '', name: '', isShow: true },
-				{ pic: '', name: '', isShow: true },
-				{ pic: '', name: '', isShow: true },
-				{ pic: '', name: '', isShow: true },
-				{ pic: '', name: '', isShow: true },
-				{ pic: '', name: '', isShow: true }
-			],
-			autoplay: true,
-			circular: true,
-			interval: 3000,
-			duration: 500,
-			isAuto: false, //没有授权的不会自动授权
-			isShowAuth: false, //是否隐藏授权
-			orderStatusNum: {},
-			userInfo: { aratar: '/static/f.png' },
-			MyMenus: [],
-			is_promoter: 0, //推广人开关  1开
-			extension_status: 0
-		};
-	},
-	onLoad() {
-		setTimeout(() => {
-			this.showSkeleton = false;
-		}, 500);
-	},
-	onReady() {
-		this.isNodes++;
-	},
-	mounted: function() {},
-	onShow: function() {
-		let that = this;
-		if (that.isLogin) {
-			this.getUserInfo();
-			this.orderNum();
-		} else {
-			this.userInfo = {};
-			this.orderMenu.forEach(v => {
-				v.num = 0;
-			});
-			this.getMyMenus();
-		}
-	},
-	methods: {
-		...mapMutations(['UPDATE_USERINFO']),
-		authTo(url) {
-			if (this.isLogin) {
-				uni.navigateTo({
-					url
-				});
-			} else {
-				this.openAuto();
-			}
+				MyMenus: [],
+				is_promoter: 0, //推广人开关  1开
+				extension_status: 0,
+				dsf: 0,
+				zc: 0,
+				sr: 0
+			};
 		},
-		navto(url) {
-			uni.navigateTo({
-				url,
-				fail() {
-					uni.switchTab({
-						url
-					})
-				}
-			})
+		onLoad() {
+			setTimeout(() => {
+				this.showSkeleton = false;
+			}, 500);
 		},
-		toService(mer) {
-			uni.navigateTo({
-				url: '/pages/admin/business/index?is_sys=' + (mer ? '0' : '1')
-			});
+		onReady() {
+			this.isNodes++;
 		},
-		// 菜单显示
-		filterMenus: function(item) {
-			let that = this;
-			if (item.url == '/pages/users/user_money/index') item.isShow = that.balance_func_status == 1;
-			else if (item.url == '/pages/users/user_spread_user/index') {
-				if (that.extension_status == 0) {
-					item.isShow = false;
-				} else if (that.extension_status == 1) {
-					if (that.is_promoter == 1) {
-						item.isShow = that.is_promoter == 1 && that.extension_status == 1;
-					} else if (that.is_promoter == 0) {
-						item.isShow = that.is_promoter == 0 && that.extension_status == 1;
-						item.url = '/pages/users/distributor/index';
-					}
+		filters: {
+			phone(value) {
+				if (!value) return '';
+				let str = value;
+				str = str.replace(new RegExp("[^0-9]+", "g"), "")
+				if (str.length == 11) {
+					str = str.toString().replace(/(\d{3})\d*(\d{4})/, '$1****$2')
+				} else {
+					str = str.toString().replace(/(\d{3})\d*(\d{4})/, '$1****$2')
 				}
-			} else if (item.url == '/pages/store/settled/index') item.isShow = that.mer_intention_open == 1 && that.hide_mer_status != 1;
-			else if (item.url == '/pages/users/user_grade/index') item.isShow = that.member_status == 1;
-			else if (item.url == '/pages/users/user_integral/index') item.isShow = that.integral_status == 1;
-			else item.isShow = true;
-		},
-		showMenu(menu) {
-			return !menu || ['integral', 'service', 'admin_order', 'verify_order', 'intention', 'promoter', 'balance'].indexOf(menu) === -1;
+				return str;
+			}
 		},
-		goUrl(url) {
-			if (url.indexOf('http') != -1) {
-				// #ifdef H5
-				location.href = url;
-				// #endif
+		mounted: function() {},
+		onShow: function() {
+			let that = this;
+			if (that.isLogin) {
+				this.getUserInfo();
+				this.orderNum();
 			} else {
-				if (['/pages/goods_cate/goods_cate', '/pages/order_addcart/order_addcart', '/pages/user/index', '/pages/plant_grass/index'].indexOf(url) == -1) {
+				this.userInfo = {};
+				this.orderMenu.forEach(v => {
+					v.num = 0;
+				});
+				this.getMyMenus();
+				setTimeout(() => {
+					this.isAuto = true;
+					this.isShowAuth = true
+				}, 300);
+			}
+		},
+		methods: {
+			...mapMutations(['UPDATE_USERINFO']),
+			makePhone() {
+				uni.makePhoneCall({
+					phoneNumber: this.lxphone
+				})
+			},
+			authTo(url) {
+				if (this.isLogin) {
 					uni.navigateTo({
-						url: url
+						url
 					});
 				} else {
-					uni.switchTab({
-						url: url
-					});
+					this.openAuto();
 				}
-			}
-		},
-		// 去聊天列表
-		goChat() {
-			let type = this.userInfo.service ? 1 : 0;
-			uni.navigateTo({
-				url: `/pages/chat/customer_list/index?type=${type}`
-			});
-		},
-		// 记录会员访问
-		setVisit() {
-			setVisit({
-				url: '/pages/user/index'
-			}).then(res => {});
-		},
-		// 打开授权
-		openAuto() {
-			this.isAuto = true;
-			this.isShowAuth = true;
-		},
-		// 授权回调
-		onLoadFun() {
-			this.getUserInfo();
-			this.getMyMenus();
-			this.orderNum();
-			this.isShowAuth = false;
-		},
-		Setting: function() {
-			uni.openSetting({
-				success: function(res) {}
-			});
-		},
-		// 授权关闭
-		authColse: function(e) {
-			this.isShowAuth = e;
-		},
-		// 绑定手机
-		bindPhone() {
-			uni.navigateTo({
-				url: '/pages/users/user_phone/index'
-			});
-		},
-		/**
-		 * 获取个人用户信息
-		 */
-		getUserInfo: function() {
-			let that = this;
-			getUserInfo().then(res => {
-				this.UPDATE_USERINFO(res.data);
-				(that.userInfo = res.data), (that.is_promoter = res.data.is_promoter);
-				that.extension_status = res.data.extension_status;
-				that.getMyMenus();
-			});
-		},
-		// 订单数字
-		orderNum() {
-			orderData().then(({ data }) => {
-				this.orderMenu.forEach((item, index) => {
-					console.log('item');
-					switch (item.title) {
-						case '待付款':
-							item.num = data.noPay;
-							break;
-						case '待发货':
-							item.num = data.noPostage;
-							break;
-						case '待收货':
-							item.num = data.noDeliver;
-							break;
-						case '待评价':
-							item.num = data.noComment;
-							break;
-						case '售后/退款':
-							item.num = data.refund;
-							break;
+			},
+			navto(url) {
+				uni.navigateTo({
+					url,
+					fail() {
+						uni.switchTab({
+							url
+						})
 					}
-				});
-			});
-		},
-		/**
-		 *
-		 * 获取个人中心图标
-		 */
-		getMyMenus: function() {
-			let that = this;
-			if (this.MyMenus.length) return;
-			getMenuList().then(res => {
-				that.personalMenu = [];
-				res.data.menu.forEach((item, index) => {
-					that.filterMenus(item);
-					that.personalMenu.push(item);
-				});
-				that.imgUrls = res.data.banner;
-			});
-		},
-		// 编辑页面
-		goEdit() {
-			if (this.isLogin) {
+				})
+			},
+			toService(mer) {
 				uni.navigateTo({
-					url: '/pages/users/user_info/index'
+					url: '/pages/admin/business/index?is_sys=' + (mer ? '0' : '1')
 				});
-			} else {
-				this.openAuto();
-			}
-		},
-		goSetting() {
-			if (this.isLogin) {
+			},
+			// 菜单显示
+			filterMenus: function(item) {
+				let that = this;
+				if (item.url == '/pages/users/user_money/index') item.isShow = that.balance_func_status == 1;
+				else if (item.url == '/pages/users/user_spread_user/index') {
+					if (that.extension_status == 0) {
+						item.isShow = false;
+					} else if (that.extension_status == 1) {
+						if (that.is_promoter == 1) {
+							item.isShow = that.is_promoter == 1 && that.extension_status == 1;
+						} else if (that.is_promoter == 0) {
+							item.isShow = that.is_promoter == 0 && that.extension_status == 1;
+							item.url = '/pages/users/distributor/index';
+						}
+					}
+				} else if (item.url == '/pages/store/settled/index') item.isShow = that.mer_intention_open == 1 && that
+					.hide_mer_status != 1;
+				else if (item.url == '/pages/users/user_grade/index') item.isShow = that.member_status == 1;
+				else if (item.url == '/pages/users/user_integral/index') item.isShow = that.integral_status == 1;
+				else item.isShow = true;
+			},
+			showMenu(menu) {
+				return !menu || ['integral', 'service', 'admin_order', 'verify_order', 'intention', 'promoter', 'balance']
+					.indexOf(menu) === -1;
+			},
+			goUrl(url) {
+				if (url.indexOf('http') != -1) {
+					// #ifdef H5
+					location.href = url;
+					// #endif
+				} else {
+					if (['/pages/goods_cate/goods_cate', '/pages/order_addcart/order_addcart', '/pages/user/index',
+							'/pages/plant_grass/index'
+						].indexOf(url) == -1) {
+						uni.navigateTo({
+							url: url
+						});
+					} else {
+						uni.switchTab({
+							url: url
+						});
+					}
+				}
+			},
+			// 去聊天列表
+			goChat() {
+				let type = this.userInfo.service ? 1 : 0;
 				uni.navigateTo({
-					url: '/pages/users/user_setting/index'
+					url: `/pages/chat/customer_list/index?type=${type}`
 				});
-			} else {
-				this.openAuto();
-			}
-		},
-		// 签到
-		goSignIn() {
-			uni.navigateTo({
-				url: '/pages/users/user_sgin/index'
-			});
-		},
-		// goMenuPage
-		goMenuPage(url) {
-			if (this.isLogin) {
+			},
+			// 记录会员访问
+			setVisit() {
+				setVisit({
+					url: '/pages/user/index'
+				}).then(res => {});
+			},
+			// 打开授权
+			openAuto() {
+				this.isAuto = true;
+				this.isShowAuth = true;
+			},
+			// 授权回调
+			onLoadFun() {
+				this.getUserInfo();
+				this.getMyMenus();
+				this.orderNum();
+				this.isShowAuth = false;
+			},
+			Setting: function() {
+				uni.openSetting({
+					success: function(res) {}
+				});
+			},
+			// 授权关闭
+			authColse: function(e) {
+				this.isShowAuth = e;
+			},
+			// 绑定手机
+			bindPhone() {
 				uni.navigateTo({
-					url
+					url: '/pages/users/user_phone/index'
 				});
-			} else {
-				this.openAuto();
-			}
-		},
-		// 复制客服微信
-		comfirm(text) {
-			console.log(text);
-			const result = this.uniCopy(text);
-			if (result === false) {
-				uni.showToast({
-					title: '不支持'
+			},
+			/**
+			 * 获取个人用户信息
+			 */
+			getUserInfo: function() {
+				let that = this;
+				getUserInfo().then(res => {
+					this.UPDATE_USERINFO(res.data);
+					(that.userInfo = res.data), (that.is_promoter = res.data.is_promoter);
+					that.extension_status = res.data.extension_status;
+					that.getMyMenus();
+					that.getHealthy()
 				});
-			} else {
-				uni.showToast({
-					title: '复制成功',
-					icon: 'none'
+			},
+			//获取健康数据
+			getHealthy() {
+				healthyIntegrallist().then(res => {
+					this.dsf = res.data.dsf
+					this.zc = res.data.zc
+					this.sr = res.data.sr
+				})
+			},
+			// 订单数字
+			orderNum() {
+				orderData().then(({
+					data
+				}) => {
+					this.orderMenu.forEach((item, index) => {
+						switch (item.title) {
+							case '待付款':
+								item.num = data.noPay;
+								break;
+							case '待发货':
+								item.num = data.noPostage;
+								break;
+							case '待收货':
+								item.num = data.noDeliver;
+								break;
+							case '待评价':
+								item.num = data.noComment;
+								break;
+							case '售后/退款':
+								item.num = data.refund;
+								break;
+						}
+					});
 				});
-			}
-			this.$refs.popupkf.close();
-		},
-		// 打开客服
-		openKf() {
-			this.$refs.popupkf.open();
-		},
-		// 关闭客服
-		cancel() {
-			this.$refs.popupkf.close();
+			},
+			/**
+			 *
+			 * 获取个人中心图标
+			 */
+			getMyMenus: function() {
+				let that = this;
+				if (this.MyMenus.length) return;
+				getMenuList().then(res => {
+					that.personalMenu = [];
+					res.data.menu.forEach((item, index) => {
+						that.filterMenus(item);
+						that.personalMenu.push(item);
+					});
+					that.imgUrls = res.data.banner;
+				});
+			},
+			// 编辑页面
+			goEdit() {
+				if (this.isLogin) {
+					uni.navigateTo({
+						url: '/pages/users/user_info/index'
+					});
+				} else {
+					this.openAuto();
+				}
+			},
+			goSetting() {
+				if (this.isLogin) {
+					uni.navigateTo({
+						url: '/pages/users/user_setting/index'
+					});
+				} else {
+					this.openAuto();
+				}
+			},
+			// 签到
+			goSignIn() {
+				uni.navigateTo({
+					url: '/pages/users/user_sgin/index'
+				});
+			},
+			// goMenuPage
+			goMenuPage(url) {
+				if (this.isLogin) {
+					uni.navigateTo({
+						url
+					});
+				} else {
+					this.openAuto();
+				}
+			},
+			// 复制客服微信
+			comfirm(text) {
+				console.log(text);
+				const result = this.uniCopy(text);
+				if (result === false) {
+					uni.showToast({
+						title: '不支持'
+					});
+				} else {
+					uni.showToast({
+						title: '复制成功',
+						icon: 'none'
+					});
+				}
+				this.$refs.popupkf.close();
+			},
+			// 打开客服
+			openKf() {
+				this.$refs.popupkf.open();
+			},
+			// 关闭客服
+			cancel() {
+				this.$refs.popupkf.close();
+			},
+			uniCopy(content) {
+				/**
+				 * 小程序端 和 app端的复制逻辑
+				 */
+				//#ifndef H5
+				uni.setClipboardData({
+					data: content,
+					success: function() {
+						console.log('success');
+						return true;
+					}
+				});
+				//#endif
+
+				/**
+				 * H5端的复制逻辑
+				 */
+				// #ifdef H5
+				if (!document.queryCommandSupported('copy')) {
+					//为了兼容有些浏览器 queryCommandSupported 的判断
+					// 不支持
+					return false;
+				}
+				let textarea = document.createElement('textarea');
+				textarea.value = content;
+				textarea.readOnly = 'readOnly';
+				document.body.appendChild(textarea);
+				textarea.select(); // 选择对象
+				textarea.setSelectionRange(0, content.length); //核心
+				let result = document.execCommand('copy'); // 执行浏览器复制命令
+				textarea.remove();
+				return result;
+				// #endif
+			},
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-%flex-center {
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	align-items: center;
-}
-
-%section {
-	display: flex;
-	justify-content: space-around;
-	align-content: center;
-	background: #fff;
-	border-radius: 10rpx;
-}
-
-.container,
-page {
-	min-height: 100%;
-	height: auto;
-	background-color: $page-color-base;
-}
-
-.vheigh {
-	height: var(--status-bar-height);
-	background-color: $base-color;
-}
-
-.top-image {
-	position: absolute;
-	top: 0;
-	left: 0;
-	right: 0;
-	height: 230rpx;
-
-	image {
-		width: 100%;
-		height: 100%;
-	}
-}
-
-.tool-list {
-	width: 690rpx;
-	margin: auto;
-	margin-top: 20rpx;
-	background: #ffffff;
-	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-	border-radius: 20rpx;
-}
-
-.popup-box {
-	width: 522rpx;
-	height: 605rpx;
-	background-color: #ffffff;
-	border-radius: 20rpx;
-	position: relative;
-
-	.img {
-		position: relative;
-		top: -56rpx;
-		left: 0;
-		width: 522rpx;
-		height: 132rpx;
+	%flex-center {
 		display: flex;
+		flex-direction: column;
 		justify-content: center;
+		align-items: center;
+	}
+
+	%section {
+		display: flex;
+		justify-content: space-around;
+		align-content: center;
+		background: #fff;
+		border-radius: 10rpx;
+	}
+
+	.container,
+	page {
+		min-height: 100%;
+		height: auto;
+		background-color: #fff;
+		// background-color: $page-color-base;
+	}
+
+	.vheigh {
+		height: var(--status-bar-height);
+		background-color: #fff;
+	}
+
+	.top-image {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		height: 230rpx;
 
 		image {
-			border-radius: 20rpx 20rpx 0 0;
-			width: 450rpx;
-			height: 132rpx;
+			width: 100%;
+			height: 100%;
 		}
 	}
 
-	.mian {
-		margin-top: -44rpx;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		// padding: 32rpx 32rpx;
+	.tool-list {
+		width: 690rpx;
+		margin: auto;
+		margin-top: 20rpx;
+		background: #ffffff;
+		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+		border-radius: 20rpx;
+	}
+
+	.popup-box {
+		width: 522rpx;
+		height: 605rpx;
 		background-color: #ffffff;
-		border-radius: 0 0 20rpx 20rpx;
-		text-align: center;
+		border-radius: 20rpx;
+		position: relative;
 
-		.delivery {
-			font-size: 40rpx;
-			color: #333333;
+		.img {
+			position: relative;
+			top: -56rpx;
+			left: 0;
+			width: 522rpx;
+			height: 132rpx;
 			display: flex;
-			align-items: center;
-			flex-direction: column;
+			justify-content: center;
 
 			image {
-				margin-top: 48rpx;
-				width: 172rpx;
-				height: 160rpx;
+				border-radius: 20rpx 20rpx 0 0;
+				width: 450rpx;
+				height: 132rpx;
 			}
 		}
 
-		.nocancel {
-			font-size: 32rpx;
-			color: #333333;
-			margin-top: 14rpx;
-		}
-
-		.comfirm-box {
-			margin-top: 52rpx;
+		.mian {
+			margin-top: -44rpx;
 			display: flex;
-			// margin-bottom: 32rpx;
+			flex-direction: column;
+			align-items: center;
+			// padding: 32rpx 32rpx;
+			background-color: #ffffff;
+			border-radius: 0 0 20rpx 20rpx;
+			text-align: center;
 
-			// justify-content: space-around;
-			.cancel {
+			.delivery {
+				font-size: 40rpx;
+				color: #333333;
 				display: flex;
 				align-items: center;
-				justify-content: center;
-				width: 197rpx;
-				height: 74rpx;
-				border: 1px solid #dcc786;
-				border-radius: 38rpx;
+				flex-direction: column;
 
+				image {
+					margin-top: 48rpx;
+					width: 172rpx;
+					height: 160rpx;
+				}
+			}
+
+			.nocancel {
 				font-size: 32rpx;
-				color: #605128;
+				color: #333333;
+				margin-top: 14rpx;
 			}
 
-			.comfirm {
-				margin-left: 32rpx;
+			.comfirm-box {
+				margin-top: 52rpx;
 				display: flex;
-				align-items: center;
-				justify-content: center;
-				width: 197rpx;
-				height: 74rpx;
-				background: linear-gradient(-90deg, #d1ba77 0%, #f7e8ad 100%);
-				border-radius: 38px;
-				font-size: 32rpx;
-				color: #605128;
+				// margin-bottom: 32rpx;
+
+				// justify-content: space-around;
+				.cancel {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 197rpx;
+					height: 74rpx;
+					border: 1px solid #dcc786;
+					border-radius: 38rpx;
+
+					font-size: 32rpx;
+					color: #605128;
+				}
+
+				.comfirm {
+					margin-left: 32rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 197rpx;
+					height: 74rpx;
+					background: linear-gradient(-90deg, #d1ba77 0%, #f7e8ad 100%);
+					border-radius: 38px;
+					font-size: 32rpx;
+					color: #605128;
+				}
 			}
 		}
 	}
-}
 
-.popup {
-	width: 560rpx;
-	padding-bottom: 45rpx;
-	background-color: #ffffff;
-	border-radius: 15rpx;
-	text-align: center;
-	line-height: 1;
+	.popup {
+		width: 560rpx;
+		padding-bottom: 45rpx;
+		background-color: #ffffff;
+		border-radius: 15rpx;
+		text-align: center;
+		line-height: 1;
 
-	.popup-dox {
-		position: relative;
+		.popup-dox {
+			position: relative;
 
-		.popup-logo {
-			margin: -160rpx auto 0;
-			width: 400rpx;
-			height: 200rpx;
+			.popup-logo {
+				margin: -160rpx auto 0;
+				width: 400rpx;
+				height: 200rpx;
+			}
 		}
-	}
 
-	.popup-title {
-		margin-top: 85rpx;
-		font-size: 40rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #2a2a2a;
+		.popup-title {
+			margin-top: 85rpx;
+			font-size: 40rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #2a2a2a;
 
-		text {
-			font-size: 56rpx;
-			color: #e83f30;
+			text {
+				font-size: 56rpx;
+				color: #e83f30;
+			}
 		}
-	}
 
-	.popup-tip {
-		margin-top: 20rpx;
-		font-size: 28rpx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		color: #8c8c8c;
+		.popup-tip {
+			margin-top: 20rpx;
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #8c8c8c;
 
-		text {
-			color: #e83f30;
+			text {
+				color: #e83f30;
+			}
 		}
-	}
 
-	.popup-btn {
-		margin: 58rpx auto 0;
-		width: 270rpx;
-		height: 66rpx;
-		background: #f0c838;
-		border-radius: 34rpx;
-		text-align: center;
-		line-height: 66rpx;
-		font-size: 36rpx;
-		font-family: Source Han Sans CN;
-		font-weight: 500;
-		color: #ffffff;
+		.popup-btn {
+			margin: 58rpx auto 0;
+			width: 270rpx;
+			height: 66rpx;
+			background: #f0c838;
+			border-radius: 34rpx;
+			text-align: center;
+			line-height: 66rpx;
+			font-size: 36rpx;
+			font-family: Source Han Sans CN;
+			font-weight: 500;
+			color: #ffffff;
+		}
 	}
-}
-
-.user-wrap {
-	position: relative;
-	z-index: 10;
-	width: 690rpx;
-	height: 283rpx;
-	background: #ffffff;
-	box-shadow: 0px 4rpx 13rpx 0px rgba(229, 229, 229, 0.46);
-	border-radius: 20rpx;
-	padding: 34rpx 0 40rpx;
-	margin: auto;
-
-	.info-left {
-		padding-left: 34rpx;
-
-		.user-name {
-			display: flex;
-			align-items: center;
 
-			image {
-				width: 120rpx;
-				height: 120rpx;
-				border-radius: 50%;
+	.user-wrap {
+		position: absolute;
+		z-index: 10;
+		width: 690rpx;
+		// height: 283rpx;
+		// background: #ffffff;
+		// box-shadow: 0px 4rpx 13rpx 0px rgba(229, 229, 229, 0.46);
+		border-radius: 20rpx;
+		margin: auto;
+		// top: 0;
+		bottom: 133rpx;
+
+		.info-left {
+			padding-left: 34rpx;
+
+			.user-name {
+				display: flex;
+				align-items: center;
+
+				image {
+					width: 120rpx;
+					height: 120rpx;
+					border-radius: 50%;
+				}
+
+				.user-font {
+					padding-left: 34rpx;
+
+					.name {
+						width: 250rpx;
+						font-size: 40rpx;
+						font-family: Source Han Sans CN;
+						font-weight: 400;
+						color: #fff;
+					}
+
+					.phone {
+						margin: 10rpx 0;
+						font-size: 20rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #fff;
+					}
+
+					.yqm {
+						height: 30rpx;
+						line-height: 30rpx;
+						display: inline-block;
+						border-radius: 15rpx;
+						background-color: #474758;
+						padding: 0 15rpx 0 0;
+						color: #FBD9A1;
+						font-size: 18rpx;
+
+						.yqm-left {
+							padding: 0 10rpx;
+							margin-right: 10rpx;
+							display: inline-block;
+							background: linear-gradient(-58deg, #C49B5C 0%, #EED9A7 100%);
+							border-radius: 15rpx;
+							color: #474758;
+							font-size: 16rpx;
+						}
+					}
+				}
 			}
 
-			.user-font {
-				padding-left: 34rpx;
+			.kpi {
+				width: 178rpx;
+				height: 60rpx;
+				position: relative;
 
-				.name {
-					width: 250rpx;
-					font-size: 40rpx;
-					font-family: Source Han Sans CN;
-					font-weight: 400;
-					color: #333333;
+				image {
+					position: absolute;
+					top: 0;
+					left: 0;
+					width: 178rpx;
+					height: 60rpx;
 				}
 
-				.phone {
-					margin-top: 10rpx;
-					font-size: 20rpx;
-					font-family: PingFang SC;
+				.user-level {
+					position: absolute;
+					top: 0;
+					right: 0;
+					height: 60rpx;
+					line-height: 60rpx;
+					width: 120rpx;
+					// background-color: red;
+					font-size: 28rpx;
 					font-weight: 500;
-					color: #999999;
+					color: #93794b;
+					text-align: right;
+					padding-right: 24rpx;
 				}
 			}
 		}
 
-		.kpi {
-			width: 178rpx;
-			height: 60rpx;
-			position: relative;
-			image {
-				position: absolute;
-				top: 0;
-				left: 0;
-				width: 178rpx;
-				height: 60rpx;
+		.info-right {
+			display: flex;
+			align-items: center;
+			margin-top: 54rpx;
+			padding: 0 34rpx;
+
+			.iright-icon {
+				width: 32rpx;
+				height: 32rpx;
 			}
-			.user-level {
-				position: absolute;
-				top: 0;
-				right: 0;
-				height: 60rpx;
-				line-height: 60rpx;
-				width: 120rpx;
-				// background-color: red;
+
+			.iright-font {
+				margin-left: 12rpx;
 				font-size: 28rpx;
-				font-weight: 500;
-				color: #93794b;
-				text-align: right;
-				padding-right: 24rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
 			}
 		}
 	}
 
-	.info-right {
-		display: flex;
-		align-items: center;
-		margin-top: 54rpx;
-		padding: 0 34rpx;
+	.user-set {
+		justify-content: flex-end;
+		height: 100rpx;
 
-		.iright-icon {
-			width: 32rpx;
-			height: 32rpx;
+		view {
+			flex-shrink: 0;
 		}
 
-		.iright-font {
-			margin-left: 12rpx;
-			font-size: 28rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #333333;
+		padding: 30rpx;
+
+		image {
+			height: 40rpx;
+			width: 40rpx;
 		}
 	}
-}
 
-.user-set {
-	justify-content: flex-end;
-	height: 100rpx;
-	view {
-		flex-shrink: 0;
-	}
+	.main-box {
+		margin: 20rpx auto 0;
+		width: 710rpx;
+		background: #ffffff;
+		// box-shadow: 0px 4rpx 14rpx 0px rgba(229, 229, 229, 0.46);
+		border-radius: 20rpx;
 
-	padding: 30rpx;
+		.title {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 24rpx;
+			padding-left: 0;
+			// border-bottom: 1px solid #eeeeee;
 
-	image {
-		height: 40rpx;
-		width: 40rpx;
-	}
-}
+			.title-left {
+				display: flex;
+				align-items: center;
 
-.main-box {
-	margin: 20rpx auto 0;
-	width: 710rpx;
-	background: #ffffff;
-	box-shadow: 0px 4rpx 14rpx 0px rgba(229, 229, 229, 0.46);
-	border-radius: 20rpx;
+				.title-icon {
+					width: 32rpx;
+					height: 32rpx;
+				}
 
-	.title {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 24rpx;
-		border-bottom: 1px solid #eeeeee;
+				.title-font {
+					// margin-left: 20rpx;
+					font-size: 28rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #333333;
+				}
+			}
 
-		.title-left {
-			display: flex;
-			align-items: center;
+			.title-right {
+				width: 14rpx;
+				height: 24rpx;
+			}
+		}
 
-			.title-icon {
-				width: 32rpx;
-				height: 32rpx;
+		.main {
+			padding: 30rpx 0 0rpx;
+			// flex-wrap: wrap;
+			justify-content: flex-start;
+
+			.jg {
+				width: 1px;
+				height: 100rpx;
+				background: #eeeeee;
+				margin-top: 20rpx;
 			}
 
-			.title-font {
-				margin-left: 20rpx;
-				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #333333;
+			.item {
+				// padding-bottom: 20rpx;
+				width: 25%;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				margin-top: 20rpx;
+				font-size: 24rpx;
+				font-weight: 500;
+
+				.item-img {
+					height: 47rpx;
+				}
+
+				.item-num {
+					color: #999999;
+				}
+
+				.item-font {
+					color: #333333;
+					padding-top: 15rpx;
+				}
 			}
-		}
 
-		.title-right {
-			width: 14rpx;
-			height: 24rpx;
+			.oitem {
+				width: 25%;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+
+				.oitem-image {
+					height: 50rpx;
+					width: 48rpx;
+				}
+
+				.oitem-font {
+					margin-top: 20rpx;
+					font-size: 24rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+				}
+			}
 		}
 	}
 
-	.main {
-		padding: 50rpx 0 30rpx;
-		.jg {
-			width: 1px;
-			height: 100rpx;
-			background: #eeeeee;
-		}
-		.item {
-			padding-bottom: 20rpx;
-			width: 25%;
+	.gpai {
+		width: 100rpx;
+		line-height: 40rpx;
+		border-radius: 25rpx;
+		position: absolute;
+		top: 120rpx;
+		left: 40rpx;
+		font-size: 24rpx;
+		color: #c6914e;
+		text-align: center;
+		background-color: #f2d4ae;
+	}
+
+	.my-tools {
+		width: 710rpx;
+		// height: 418rpx;
+		background: #ffffff;
+		// box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+		border-radius: 20rpx;
+		margin: 20rpx auto;
+
+		// background-color: red;
+		.my-order {
+			height: 73rpx;
+			width: 100%;
+			// border-bottom: 2rpx solid #f5f5f5;
 			display: flex;
-			flex-direction: column;
 			align-items: center;
+			justify-content: flex-start;
 
-			.item-num {
-				font-size: 36rpx;
+			.order {
+				font-size: 30rpx;
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #333333;
+				// margin-left: 36rpx;
+				margin-right: 520rpx;
 			}
 
-			.item-font {
-				margin-top: 18rpx;
-				font-size: 22rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #666666;
+			image {
+				width: 12rpx;
+				height: 22rpx;
 			}
 		}
 
-		.oitem {
-			width: 25%;
-			display: flex;
-			flex-direction: column;
+		.tool {
+			flex-wrap: wrap;
+			justify-content: flex-start;
 			align-items: center;
 
-			.oitem-image {
-				height: 50rpx;
-				width: 48rpx;
-			}
+			.tool-item {
+				width: 25%;
+				height: 160rpx;
+				// background-color: #bfa;
+				display: flex;
+				align-items: center;
+				flex-direction: column;
+				justify-content: center;
 
-			.oitem-font {
-				margin-top: 20rpx;
-				font-size: 24rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #333333;
+				.tool-img {
+					width: 42rpx;
+					height: 42rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+
+				.tool-name {
+					padding-top: 20rpx;
+					font-size: 24rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+				}
 			}
 		}
 	}
-}
-
-.gpai {
-	width: 100rpx;
-	line-height: 40rpx;
-	border-radius: 25rpx;
-	position: absolute;
-	top: 120rpx;
-	left: 40rpx;
-	font-size: 24rpx;
-	color: #c6914e;
-	text-align: center;
-	background-color: #f2d4ae;
-}
-.my-tools {
-	width: 710rpx;
-	// height: 418rpx;
-	background: #ffffff;
-	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-	border-radius: 20rpx;
-	margin: 20rpx auto;
-	// background-color: red;
-	.my-order {
-		height: 73rpx;
-		width: 100%;
-		border-bottom: 2rpx solid #f5f5f5;
-		display: flex;
-		align-items: center;
-		justify-content: flex-start;
 
-		.order {
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #333333;
-			margin-left: 36rpx;
-			margin-right: 520rpx;
+	.user-info {
+		width: 750rpx;
+		height: 433rpx;
+		position: relative;
+
+		.user-info-bg {
+			width: 750rpx;
+			height: 433rpx;
 		}
 
-		image {
-			width: 12rpx;
-			height: 22rpx;
+		.user-info-tit {
+			width: 100%;
+			position: absolute;
+			/* #ifdef H5 */
+			top: 24rpx;
+			/* #endif */
+			/* #ifdef APP-PLUS */
+			top: 44px;
+			/* #endif */
+			text-align: center;
+			font-size: 34rpx;
+			font-weight: 500;
+			color: #FFFFFF;
+		}
+
+		.u-set {
+			display: block;
+			width: 46rpx;
+			height: 48rpx;
+			position: absolute;
+			right: 32rpx;
+			bottom: 210rpx;
 		}
 	}
-	.tool {
-		flex-wrap: wrap;
-		justify-content: flex-start;
+
+	.u-ye {
+		width: 750rpx;
+		height: 80rpx;
+		background: #D66650;
 		align-items: center;
-		.tool-item {
-			width: 25%;
-			height: 160rpx;
-			// background-color: #bfa;
+		color: #fff;
+
+		.info-right {
+			width: 50%;
 			display: flex;
 			align-items: center;
-			flex-direction: column;
+			padding: 0 34rpx;
 			justify-content: center;
-			.tool-img {
-				width: 42rpx;
-				height: 42rpx;
-				image {
-					width: 100%;
-					height: 100%;
-				}
+
+			.iright-icon {
+				width: 32rpx;
+				// height: 32rpx;
 			}
-			.tool-name {
-				padding-top: 20rpx;
-				font-size: 24rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #333333;
+
+			.iright-font {
+				margin-left: 12rpx;
+				font-size: 26rpx;
+				font-weight: bold;
 			}
 		}
 	}
-}
+
+	.u-up {
+		width: 690rpx;
+		height: 90rpx;
+		margin: 20rpx auto;
+		position: relative;
+
+		image {
+			width: 690rpx;
+			height: 90rpx;
+		}
+
+		.u-up-tit {
+			font-size: 30rpx;
+			font-weight: 500;
+			color: #FFE1AA;
+			line-height: 90rpx;
+			position: absolute;
+			top: 0;
+			left: 73rpx;
+		}
+
+		.u-up-btn {
+			position: absolute;
+			right: 20rpx;
+			top: 0;
+			bottom: 0;
+			margin: auto;
+			width: 148rpx;
+			height: 50rpx;
+			line-height: 50rpx;
+			background: linear-gradient(-90deg, #FFD070 0%, #FFDEA2 99%);
+			border-radius: 25px;
+			font-size: 28rpx;
+			font-weight: 500;
+			color: #1C1E1F;
+			text-align: center;
+		}
+	}
 </style>

pages/user/jfzye.vue

@@ -0,0 +1,345 @@
+<template>
+	<view class="content">
+		<view class="content-money">
+			<view class="flex">
+				<view class="buttom">
+					<view class="icon" v-if="type == 1">{{ userInfo.integral | getMoneyStyle }}</view>
+					<view class="icon" v-if="type == 2">{{ userInfo.healthy_integral | getMoneyStyle }}</view>
+					<text class="text">可转账余额</text>
+				</view>
+			</view>
+		</view>
+		<!-- <view class="row-box">
+			<view class="title">收款人UID</view>
+			<view class="row"><input class="input" type="number" v-model="card" placeholder="请输入收款人UID"
+					placeholder-class="placeholder" /></view>
+		</view> -->
+		<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" />
+			<!-- 	<view class="buttom" @click="withdrawal = userInfo.integral" v-if="type == 1">全部转账</view>
+				<view class="buttom" @click="withdrawal = userInfo.dynamic_integral" v-if="type == 2">全部转账</view> -->
+				<!-- <view class="buttom" @click="withdrawal = userInfo.healthy_integral" v-if="type == 4">全部转账</view> -->
+			</view>
+		</view>
+		<button class="add-btn up" :class="{ action: loding }" @click="!loding ? confirm() : ''">转余额</button>
+	</view>
+</template>
+
+<script>
+	import { getMoneyStyle } from '@/utils/rocessor.js';
+	import {
+		mapMutations,
+		mapGetters
+	} from 'vuex';
+	import {
+		getUserInfo,
+		jfzz,
+		jtjfzye
+	} from '@/api/user.js';
+	export default {
+		data() {
+			return {
+money: '0.00', //可提现金额
+			withdrawal: '', //提现金额
+			password: '', //支付密码
+			card: '', //转账卡号
+			name: '',
+			// #ifdef H5
+			weichatBsrowser: false,
+			// #endif
+			loding: false,
+			type: 0
+			}
+		},
+		filters: {
+			getMoneyStyle
+		},
+		onLoad(options) {
+			// #ifdef H5
+			this.weichatBsrowser = uni.getStorageSync('weichatBrowser');
+			// #endif
+			this.dataUp();
+			if (options.type) {
+				this.type = options.type;
+			}
+		},
+		onShow() {
+
+		},
+		onReachBottom() {
+
+		},
+		onReady() {
+
+		},
+		computed: {
+			...mapGetters(['userInfo'])
+		},
+		methods: {
+			...mapMutations(['UPDATE_USERINFO']),
+			dataUp() {
+				let obj = this;
+				getUserInfo({})
+					.then(e => {
+						// 保存返回用户数据
+						obj.UPDATE_USERINFO(e.data);
+					})
+					.catch(e => {
+						console.log(e);
+					});
+			},
+			// 提交
+			confirm() {
+				let obj = this;
+				obj.loding = true;
+				if (obj.withdrawal == 0) {
+					obj.loding = false;
+					uni.showModal({
+						title: '提示',
+						content: '转账金额不要为0'
+					});
+					return;
+				}
+				let data = {
+					number: obj.withdrawal, //金额
+					type: obj.type
+				};
+				jtjfzye(data)
+					.then(e => {
+						// 允许按钮点击
+						obj.loding = false;
+						// 初始化提现金额
+						obj.withdrawal = '';
+						uni.showToast({
+							title: '转化成功',
+							duration: 2000,
+							position: 'top'
+						});
+						obj.dataUp();
+						// obj.cancel();
+					})
+					.catch(e => {
+						console.log(e);
+						obj.$api.msg(e);
+						obj.loding = false;
+						console.log();
+					});
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		height: 100%;
+	}
+
+	.content-money {
+		padding: 30rpx 0;
+		background: #ffffff;
+	}
+
+	.item {
+		padding: 0 $page-row-spacing;
+		background-color: #ffffff;
+	}
+
+	.flex {
+		background-color: #ffffff;
+		text-align: center;
+		margin: 0 30rpx;
+		border-radius: $border-radius-sm;
+		justify-content: center;
+
+		.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;
+		}
+	}
+
+	.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: #f21f5d;
+				font-size: $font-base;
+			}
+		}
+	}
+
+	.add-btn {
+		width: 520rpx;
+		height: 80rpx;
+		border-radius: 20rpx;
+		margin: 140rpx auto 0;
+		font-size: 36rpx;
+		font-weight: bold;
+		color: #f8daba;
+		line-height: 80rpx;
+		background-color: #303030;
+	}
+
+	.back-btn {
+		width: 520rpx;
+		height: 80rpx;
+		border-radius: 20rpx;
+		margin: 40rpx auto;
+		font-size: 36rpx;
+		font-weight: bold;
+		color: #303030;
+		background-color: #f8daba;
+	}
+
+	.name {
+		background: #fff;
+		padding: 30rpx;
+	}
+
+	.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;
+				}
+			}
+		}
+	}
+
+	.tip {
+		padding: 20rpx;
+		color: #ff0000;
+	}
+
+	/deep/ .uni-radio-input {
+		width: 45rpx;
+		height: 45rpx;
+	}
+
+	.psw-wrapper {
+		width: 548rpx;
+		height: 344rpx;
+		background-color: #ffffff;
+		border-radius: 15rpx 15rpx;
+
+		.psw-title {
+			width: 100%;
+			font-size: 35rpx;
+			padding: 43rpx 0 49rpx;
+			text-align: center;
+			font-weight: 800;
+		}
+
+		.psw-ipt {
+			display: block;
+			background-color: #dce3ed;
+			height: 90rpx;
+			width: 464rpx;
+			padding-left: 30rpx;
+			margin: 0 auto;
+			font-size: 80rpx;
+		}
+
+		.psw-btn text {
+			display: inline-block;
+			text-align: center;
+			width: 50%;
+			padding-top: 29rpx;
+			font-size: 35rpx;
+		}
+
+		.psw-qd {
+			color: #5771df;
+		}
+	}
+</style>

pages/user/myggz.vue

@@ -6,7 +6,7 @@
 				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
 				<view class="header">贡献值</view>
 			</view>
-			<view class="content-bg"><image src="../../static/img/thq-bg.png" mode=""></image></view>
+			<view class="content-bg"><image src="http://ygs.hqgjsmc.com/baseimg/thq-bg.png" mode=""></image></view>
 			<view class="money-box">
 				<view class="money">{{ userInfo.contribution || '0' }}</view>
 				<view>当前余额</view>
@@ -40,7 +40,7 @@
 									<text>{{ item.mark }}</text>
 								</view>
 								<view class="time">
-									<text>{{ item.add_time }}</text>
+									<text>{{ item.create_time }}</text>
 								</view>
 							</view>
 							<view class="money">

pages/user/mygwjf.vue

@@ -7,8 +7,9 @@
 				<view class="header">静态积分</view>
 			</view>
 
-			<view class="content-bg"><image src="../../static/img/jf-bg.png" mode=""></image></view>
-			<view class="my-jf">
+			<view class="content-bg"><image src="http://ygs.hqgjsmc.com/baseimg/jf-bg.png" mode=""></image></view>
+			<view class="my-jf">
+				<view class="jf-zz jf-ye" @click.stop="navto('/pages/user/jfzye?type=1')">积分转余额</view>
 				<view class="jf-zz" @click.stop="navto('/pages/user/xfjfzz?type=1')">积分转账</view>
 				<view class="jf-zz jf-tx" @click.stop="navto('/pages/users/user_cash/index?jftype=1')">积分提现</view>
 				<view class="jf-tit">积分余额</view>
@@ -55,7 +56,7 @@
 									<text>{{ item.mark }}</text>
 								</view>
 								<view class="time">
-									<text>{{ item.add_time }}</text>
+									<text>{{ item.create_time }}</text>
 								</view>
 							</view>
 							<view class="money">
@@ -475,6 +476,11 @@ page {
 		font-size: 27rpx;
 		font-weight: 400;
 		color: #ffffff;
+	}
+	.jf-ye {
+		left: 0;
+		width: 160rpx;
+		border-radius: 0rpx 7px 7px 0rpx;
 	}
 	.jf-tx {
 		top: 160rpx;

pages/user/myjf.vue

@@ -6,7 +6,7 @@
 				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
 				<view class="header">动态积分</view>
 			</view>
-			<view class="content-bg"><image src="../../static/img/jf-bg.png" mode=""></image></view>
+			<view class="content-bg"><image src="http://ygs.hqgjsmc.com/baseimg/jf-bg.png" mode=""></image></view>
 			<view class="money-box">
 				<view class="money">{{ userInfo.dynamic_integral * 1 || '0' }}</view>
 				<view>当前余额</view>
@@ -47,7 +47,7 @@
 									<text>{{ item.mark }}</text>
 								</view>
 								<view class="time">
-									<text>{{ item.add_time }}</text>
+									<text>{{ item.create_time }}</text>
 								</view>
 							</view>
 							<view class="money">

pages/user/mythq.vue

@@ -44,7 +44,7 @@
 									<text>{{ item.mark }}</text>
 								</view>
 								<view class="time">
-									<text>{{ item.add_time }}</text>
+									<text>{{ item.create_time }}</text>
 								</view>
 							</view>
 							<view class="money">

pages/user/qyjf.vue

@@ -0,0 +1,514 @@
+<template>
+	<view class="content">
+		<view class="content-money">
+			<view class="status_bar"><!-- 这里是状态栏 --></view>
+			<view class="body-title">
+				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
+				<view class="header">权益积分</view>
+			</view>
+
+			<view class="content-bg"><image src="http://ygs.hqgjsmc.com/baseimg/jf-bg.png" mode=""></image></view>
+			<view class="my-jf">
+				<view class="jf-zz jf-ye" @click.stop="navto('/pages/user/jfzye?type=2')">积分转余额</view>
+				<view class="jf-zz" @click.stop="navto('/pages/user/xfjfzz?type=4')">积分转账</view>
+				<view class="jf-zz jf-tx" @click.stop="navto('/pages/users/user_cash/index?jftype=3')">积分提现</view>
+				<view class="jf-tit">权益余额</view>
+				<view class="jf-val">{{ userInfo.healthy_integral * 1 || 0 }}</view>
+				<view class="jf-item-list flex">
+					<view class="jf-item">
+						<view class="item-val">{{ dsf || 0 }}</view>
+						<view class="item-tit">待释放</view>
+					</view>
+					<view class="jg"></view>
+					<!-- <view class="jf-item">
+						<view class="item-val">{{ jrsf || 0 }}</view>
+						<view class="item-tit">今日释放</view>
+					</view> -->
+					<!-- <view class="jg"></view> -->
+					<view class="jf-item">
+						<view class="item-val">{{ sr || 0 }}</view>
+						<view class="item-tit">累计收入</view>
+					</view>
+					<view class="jg"></view>
+					<view class="jf-item">
+						<view class="item-val">{{ zc || 0 }}</view>
+						<view class="item-tit">累计支出</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="status_bar"><!-- 这里是状态栏 --></view>
+		<view class="" style="height: 20rpx;"></view>
+		<view class="navbar">
+			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
+		</view>
+		<swiper :current="tabCurrentIndex" :style="{ height: maxheight }" class="swiper-box" duration="300" @change="changeTab">
+			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
+				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
+					<!-- 空白页 -->
+					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
+
+					<!-- 订单列表 -->
+					<view>
+						<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
+							<view class="title-box">
+								<view class="title">
+									<text>{{ item.mark }}</text>
+								</view>
+								<view class="time">
+									<text>{{ item.create_time }}</text>
+								</view>
+							</view>
+							<view class="money">
+								<view>{{ (item.pm == 0 ? '-' : '+') + item.number }}</view>
+								<view v-if="item.status == 0" class="status">待发放</view>
+							</view>
+						</view>
+					</view>
+					<uni-load-more :status="tabItem.loadingType" v-if="!(tabItem.orderList.length == 0 && tabItem.loaded)"></uni-load-more>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+
+<script>
+import { userBalance, healthyIntegrallist } from '@/api/wallet.js';
+import { getMoneyStyle } from '@/utils/rocessor.js';
+import { mapGetters } from 'vuex';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import empty from '@/components/empty';
+export default {
+	filters: {
+		getMoneyStyle
+	},
+	computed: {
+		...mapGetters(['userInfo'])
+	},
+	components: {
+		empty,
+		uniLoadMore
+	},
+	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: '',
+			tabCurrentIndex: 0,
+			jrsf: 0,
+			dsf: 0,
+			zc: 0,
+			sr: 0,
+			navList: [
+				{
+					state: 1,
+					text: '收入',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10, //每次信息条数
+					loaded: false
+				},
+				{
+					state: 0,
+					text: '支出',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10, //每次信息条数
+					loaded: false
+				}
+			],
+			money: ''
+		};
+	},
+	onLoad(options) {},
+	onShow() {
+		this.loadData();
+	},
+	methods: {
+		// 页面跳转
+		navto(e) {
+			uni.navigateTo({
+				url: e
+			});
+		},
+		// 点击返回 我的页面
+		toBack() {
+			uni.switchTab({
+				url:'/pages/user/index'
+			})
+		},
+		//获取收入支出信息
+		async loadData(source) {
+			let obj = this;
+			//这里是将订单挂载到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' || navItem.loadingType == 'nomore') {
+				//防止重复加载
+				return;
+			}
+			// 修改当前对象状态为加载中
+			navItem.loadingType = 'loading';
+
+			healthyIntegrallist({
+				page: navItem.page,
+				limit: navItem.limit,
+				status: navItem.state
+			})
+				.then(({ data }) => {
+					obj.sr = data.sr;
+					obj.zc = data.zc;
+					obj.dsf = data.dsf;
+					// obj.jrsf = data.jrsf;
+					navItem.orderList = navItem.orderList.concat(data.list);
+					navItem.page++;
+					if (navItem.limit == data.list.length) {
+						navItem.loadingType = 'more';
+					} else {
+						navItem.loadingType = 'noMore';
+					}
+					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;
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: #f1f1f1;
+	height: 100%;
+}
+
+.status_bar {
+	height: var(--status-bar-height);
+	width: 100%;
+}
+
+.content-money {
+	position: relative;
+	height: 480rpx;
+
+	.content-bg {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		width: 750rpx;
+		height: 480rpx;
+
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.body-title {
+		height: 80rpx;
+		text-align: center;
+		font-size: 35rpx;
+		position: relative;
+		z-index: 999;
+		.header {
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #fffeff;
+			height: 80rpx;
+			font-size: 36rpx;
+			font-weight: 700;
+			z-index: 9;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+
+		.goback-box {
+			position: absolute;
+			left: 18rpx;
+			top: 0;
+			height: 80rpx;
+			display: flex;
+			align-items: center;
+		}
+
+		.goback {
+			z-index: 100;
+			width: 34rpx;
+			height: 34rpx;
+		}
+	}
+}
+
+.info-box {
+	width: 670rpx;
+	height: 186rpx;
+	background: #ffffff;
+	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+	border-radius: 20rpx;
+	margin: -100rpx auto 0;
+	position: relative;
+	z-index: 2;
+
+	.info-item {
+		width: 50%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		line-height: 1;
+
+		.info-font {
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #999999;
+		}
+
+		.info-num {
+			margin-top: 30rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #181818;
+		}
+	}
+
+	.shu {
+		width: 2rpx;
+		height: 74rpx;
+		background: #dcdfe6;
+	}
+}
+
+.money-box {
+	position: relative;
+	z-index: 2;
+	padding-top: 20rpx;
+	color: #ffffff;
+	text-align: center;
+
+	.money {
+		font-size: 72rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #ffffff;
+	}
+
+	.text {
+		font-size: 30rpx;
+	}
+}
+
+.money-btn {
+	position: relative;
+	z-index: 2;
+	color: #ffffff;
+	padding: 0 50rpx;
+	text-align: right;
+	font-size: 30rpx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #ffffff;
+
+	text {
+		display: inline-block;
+		padding-left: 10rpx;
+	}
+}
+
+.navbar {
+	margin-top: 20rpx;
+	display: flex;
+	height: 88rpx;
+	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: #999999;
+		position: relative;
+
+		&.current {
+			color: #000;
+
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 44px;
+				height: 0;
+				border-bottom: 2px solid #fe5b38;
+			}
+		}
+	}
+}
+
+//列表
+.swiper-box {
+	.order-item:last-child {
+		margin-bottom: 60rpx;
+	}
+
+	.order-item {
+		padding: 20rpx 30rpx;
+		line-height: 1.5;
+
+		.title-box {
+			.title {
+				font-size: $font-lg;
+				color: $font-color-base;
+			}
+
+			.time {
+				font-size: $font-base;
+				color: $font-color-light;
+			}
+		}
+
+		.money {
+			color: #fd5b23;
+			font-size: $font-lg;
+			text-align: right;
+
+			.status {
+				color: $font-color-light;
+			}
+		}
+	}
+}
+
+.list-scroll-content {
+	background: #ffffff;
+	height: 100%;
+}
+
+.content {
+	height: 100%;
+
+	.empty-content {
+		background-color: #ffffff;
+	}
+}
+
+.btn-box {
+	width: 674rpx;
+	height: 88rpx;
+	background: linear-gradient(0deg, #2e58ff, #32c6ff);
+	border-radius: 44rpx;
+	font-size: 36rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #ffffff;
+	text-align: center;
+	line-height: 88rpx;
+	position: fixed;
+	bottom: 48rpx;
+	left: 0;
+	right: 0;
+	margin: 0 auto;
+}
+.my-jf {
+	position: relative;
+	width: 670rpx;
+	height: 386rpx;
+	background: #ffffff;
+	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+	border-radius: 20rpx;
+	margin: 44rpx auto 0;
+	text-align: center;
+	font-size: 28rpx;
+	font-weight: 500;
+	color: #181818;
+	.jf-zz {
+		width: 147rpx;
+		line-height: 50rpx;
+		text-align: center;
+		background: linear-gradient(90deg, #ff6f30, #ff7131);
+		border-radius: 7rpx 0px 0px 7rpx;
+		position: absolute;
+		top: 59rpx;
+		right: 0;
+		font-size: 27rpx;
+		font-weight: 400;
+		color: #ffffff;
+	}
+	.jf-tx {
+		top: 160rpx;
+	}
+	.jf-tit {
+		padding-top: 70rpx;
+	}
+	.jf-val {
+		font-size: 74rpx;
+		font-weight: bold;
+		color: #181818;
+		padding-top: 10rpx;
+	}
+	.jf-item-list {
+		position: absolute;
+		bottom: 30rpx;
+		height: 80rpx;
+		width: 670rpx;
+		.jf-item {
+			width: 25%;
+		}
+		.jg {
+			width: 1rpx;
+			height: 74rpx;
+			background: #dcdfe6;
+		}
+	}
+}
+.jf-ye {
+		left: 0;
+		width: 160rpx;
+		border-radius: 0rpx 7px 7px 0rpx;
+	}
+</style>

pages/user/xfjfzz.vue

@@ -5,7 +5,8 @@
 				<view class="buttom">
 					<view class="icon" v-if="type == 1">{{ userInfo.integral | getMoneyStyle }}</view>
 					<view class="icon" v-if="type == 2">{{ userInfo.dynamic_integral | getMoneyStyle }}</view>
-					<view class="icon" v-if="type == 3">{{ userInfo.now_money | getMoneyStyle }}</view>
+					<view class="icon" v-if="type == 3">{{ userInfo.now_money | getMoneyStyle }}</view>
+					<view class="icon" v-if="type == 4">{{ userInfo.healthy_integral | getMoneyStyle }}</view>
 					<text class="text">可转账余额</text>
 				</view>
 			</view>
@@ -20,7 +21,8 @@
 				<!-- <text class="tit">￥</text> -->
 				<input class="input" type="number" v-model="withdrawal" placeholder="转入金额" placeholder-class="placeholder" />
 				<view class="buttom" @click="withdrawal = userInfo.integral" v-if="type == 1">全部转账</view>
-				<view class="buttom" @click="withdrawal = userInfo.dynamic_integral" v-if="type == 2">全部转账</view>
+				<view class="buttom" @click="withdrawal = userInfo.dynamic_integral" v-if="type == 2">全部转账</view>
+				<!-- <view class="buttom" @click="withdrawal = userInfo.healthy_integral" v-if="type == 4">全部转账</view> -->
 			</view>
 		</view>
 		<button class="add-btn up" :class="{ action: loding }" @click="!loding ? confirm() : ''">转账</button>
@@ -69,6 +71,10 @@ export default {
 				uni.setNavigationBarTitle({
 					title: '余额转账'
 				});
+			}else if(this.type == 4) {
+				uni.setNavigationBarTitle({
+					title: '权益积分转账'
+				});
 			}
 		}
 	},

pages/users/order_confirm/index.vue

@@ -312,7 +312,7 @@
 					<view class='money'>-￥{{coupon_price}}</view>
 				</view> -->
 				<view class='item acea-row row-between-wrapper'
-					v-if="open_integral && order_type == 0 && is_jf == 0 && is_xfq == 0">
+					v-if="open_integral && order_type == 0 && is_jf == 0 && is_xfq == 0 && is_jk == 0">
 					<view>积分抵扣：</view>
 					<view class='money' >
 						<text v-if="!use_integral">当前积分<text class="pColor">{{userInfo.integral*1}}</text></text>
@@ -469,10 +469,16 @@
 					{
 						"name": "微信支付",
 						"icon": "icon-weixin2",
+						// #ifdef H5 || APP-PLUS
 						value: 'h5',
+						// #endif
+						// #ifdef MP
+						value: 'routine',
+						// #endif
 						title: '微信快捷支付',
 						payStatus: 1,
 					},
+					// #ifndef MP
 					{
 						name: "支付宝支付",
 						icon: "icon-zhifubao",
@@ -486,6 +492,8 @@
 						// payStatus: this.$store.getters.globalData.alipay_open
 						payStatus: 1,
 					},
+					// #endif
+					
 				],
 				tagStyle: {
 					img: 'width:100%;display:block;',
@@ -586,7 +594,8 @@
 				isShowDiscount: false,
 				order_key: '',
 				is_jf: 0,
-				is_xfq: 0
+				is_xfq: 0,
+				is_jk: 0,
 			};
 		},
 		computed: {
@@ -610,6 +619,9 @@
 			if (options.is_jf) {
 				this.is_jf = options.is_jf
 			}
+			if(options.is_jk) {
+				this.is_jk = options.is_jk
+			}
 
 			this.seckillId = options.seckillId
 			// #ifdef H5

pages/users/promoter-list/index.vue

@@ -1,4 +1,63 @@
 <template>
+	<view class="content">
+		<view class="content-money">
+			<view class="status_bar">
+				<!-- 这里是状态栏 -->
+			</view>
+			<view class="body-title">
+				<view class="goback-box" @click="toBack">
+					<image class="goback" src="../../../static/icon/fanhui.png" mode=""></image>
+				</view>
+				<view class="header">我的推广</view>
+			</view>
+			<view class="content-bg">
+				<image src="http://ygs.hqgjsmc.com/baseimg/zhihuanjuan.png" mode=""></image>
+			</view>
+			<view class="money-box">
+				<view class="">
+					<view class="money">{{ userInfo.spread_total }}</view>
+					<view>我的推广人数</view>
+				</view>
+				<!-- 			<view class="" style="width: 50%;">
+					<view class="money">{{ order_count || '0' }}</view>
+					<view>团队业绩</view>
+				</view> -->
+			</view>
+		</view>
+		<view class="navbar">
+			<view class="nav-item" :class="{ current: grade === 0 }" @click="setType(0)">一级</view>
+			<view class="nav-item" :class="{ current: grade == 1 }" @click="setType(1)">二级</view>
+		</view>
+
+
+		<scroll-view class="list-scroll-content" scroll-y @scrolltolower="userSpreadNewList">
+			<!-- 空白页 -->
+			<!-- <empty v-if="recordList.length === 0"></empty> -->
+
+			<!-- 订单列表 -->
+			<view v-for="(item, index) in recordList" :key="index" class="order-item flex">
+				<view class="title-box flex_item">
+					<view class="title-avatar">
+						<image :src="item.avatar|| '../../../static/error/missing-face.png'" style="width: 100rpx;height: 100rpx;"></image>
+					</view>
+					<view class="list_tpl">
+						<view class="title">
+							<text>{{ item.nickname || '' }}</text>
+						</view>
+						<view class="time">
+							<text>{{ item.spread_time }}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- <uni-load-more :status="tabItem.loadingType"></uni-load-more> -->
+			<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		</scroll-view>
+
+
+	</view>
+</template>
+<!-- <template>
 	<view :style="viewColor">
 		<view class="promoter-list">
 			<view class='promoterHeader'>
@@ -70,7 +129,7 @@
 		</view>
 		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
 	</view>
-</template>
+</template> -->
 
 <script>
 	// +----------------------------------------------------------------------
@@ -87,9 +146,13 @@
 		getUserInfo,
 		spreadInfo
 	} from '@/api/user.js';
-	import { mapGetters } from "vuex";
+	import {
+		mapGetters
+	} from "vuex";
 	import authorize from '@/components/Authorize';
-	import { HTTP_REQUEST_URL } from '@/config/app';
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
 	export default {
 		components: {
 			authorize
@@ -109,21 +172,21 @@
 				recordList: [],
 				isAuto: false, //没有授权的不会自动授权
 				isShowAuth: false, //是否隐藏授权
-				userInfo:{}
+				userInfo: {}
 			};
 		},
-		computed: mapGetters(['isLogin','viewColor','keyColor']),
+		computed: mapGetters(['isLogin', 'viewColor', 'keyColor']),
 		onLoad() {
 			if (this.isLogin) {
 				this.userSpreadNewList();
 				this.getUserInfo()
 			} else {
-                this.isAuto = true;
-                this.isShowAuth = true
+				this.isAuto = true;
+				this.isShowAuth = true
 			}
 		},
 		onShow: function() {
-			if (this.is_show){
+			if (this.is_show) {
 				this.userSpreadNewList();
 				this.getUserInfo();
 			}
@@ -132,7 +195,12 @@
 			this.is_show = true;
 		},
 		methods: {
-			getUserInfo(){
+			toBack() {
+				uni.switchTab({
+					url: '/pages/user/index'
+				})
+			},
+			getUserInfo() {
 				spreadInfo().then(res => {
 					this.userInfo = res.data
 				});
@@ -193,7 +261,7 @@
 					page: page,
 					limit: limit,
 					keyword: keyword,
-					level: grade+1,
+					level: grade + 1,
 					sort: sort,
 				}).then(res => {
 					let len = res.data.list.length;
@@ -208,13 +276,13 @@
 				});
 			}
 		},
-		onReachBottom: function() {
-			this.userSpreadNewList();
-		}
+		// onReachBottom: function() {
+		// 	this.userSpreadNewList();
+		// }
 	}
 </script>
 
-<style scoped lang="scss">
+<!-- <style scoped lang="scss">
 	.promoterHeader {
 		background-image: linear-gradient(to right, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
 	}
@@ -355,3 +423,204 @@
 		margin-right: 7rpx;
 	}
 </style>
+ -->
+<style lang="scss">
+	page {
+		background: #ffffff;
+		height: 100%;
+	}
+
+	.status_bar {
+		height: var(--status-bar-height);
+		width: 100%;
+	}
+
+	.content-money {
+		position: relative;
+		height: 480rpx;
+
+		.content-bg {
+			position: absolute;
+			top: 0;
+			left: 0;
+			right: 0;
+			width: 750rpx;
+			height: 480rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.body-title {
+			height: 80rpx;
+			text-align: center;
+			font-size: 35rpx;
+			position: relative;
+
+			.header {
+				position: absolute;
+				left: 0;
+				top: 0;
+				width: 100%;
+				font-size: 36rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #fffeff;
+				height: 80rpx;
+				font-size: 36rpx;
+				font-weight: 700;
+				z-index: 9;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+
+			.goback-box {
+				position: absolute;
+				left: 18rpx;
+				top: 0;
+				height: 80rpx;
+				display: flex;
+				align-items: center;
+			}
+
+			.goback {
+				z-index: 100;
+				width: 34rpx;
+				height: 34rpx;
+			}
+		}
+	}
+
+	.money-box {
+		position: relative;
+		z-index: 2;
+
+		/* #ifdef H5 */
+		padding-top: 80rpx;
+		/* #endif */
+		color: #ffffff;
+		text-align: center;
+		/* #ifdef APP-PLUS */
+		height: 250rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		/* #endif */
+		display: flex;
+		justify-content: center;
+
+		.money {
+			font-size: 72rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #ffffff;
+		}
+
+		.text {
+			font-size: 30rpx;
+		}
+	}
+
+	// 列表
+
+	.swiper-box {
+		padding-top: 10rpx;
+
+		
+	}
+	.order-item {
+		padding: 20rpx 30rpx;
+		line-height: 1.5;
+	
+		.title-box {
+			width: 100%;
+	
+			.title-avatar {
+				width: 100rpx;
+				height: 100rpx;
+				margin-right: 25rpx;
+	
+				// image {
+				// 	width: 100rpx;
+				// 	height: 100rpx;
+				// 	border-radius: 50%;
+				// }
+			}
+	
+			.list_tpl {
+				width: 85%;
+	
+				.title {
+					font-size: $font-lg;
+					color: $font-color-base;
+					overflow: hidden; //超出的文本隐藏
+					text-overflow: ellipsis; //溢出用省略号显示
+					white-space: nowrap;
+				}
+	
+				.time {
+					margin-top: 15rpx;
+					font-size: 22rpx;
+					color: $font-color-light;
+				}
+			}
+		}
+	
+		.money {
+			color: #DB1935;
+			font-size: $font-lg;
+		}
+	}
+
+	.list-scroll-content {
+		height: 100%;
+	}
+
+	.content {
+		height: 100%;
+
+		.empty-content {
+			background-color: #ffffff;
+		}
+	}
+
+	.navbar {
+		margin-top: 20rpx;
+		display: flex;
+		height: 88rpx;
+		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: #999999;
+			position: relative;
+
+			&.current {
+				color: #000;
+
+				&:after {
+					content: '';
+					position: absolute;
+					left: 50%;
+					bottom: 0;
+					transform: translateX(-50%);
+					width: 44px;
+					height: 0;
+					border-bottom: 2px solid #fe5b38;
+				}
+			}
+		}
+	}
+</style>

pages/users/refund/list.vue

@@ -55,7 +55,7 @@
 				</view>
 			</view>
 			<view v-else class="nothing">
-				<image src="/static/images/no_thing.png" mode="widthFix"></image>
+				<image src="http://ygs.hqgjsmc.com/baseimg/no_thing.png" mode="widthFix"></image>
 				<view class="nothing_text">暂无订单~</view>
 			</view>
 		</view>

pages/users/user_about/index.vue

@@ -181,9 +181,9 @@
 			}
 		}
 		.cancel {
-			position: fixed;
-			bottom: 60rpx;
-			left: 0;
+			// position: fixed;
+			// bottom: 60rpx;
+			// left: 0;
 			z-index: 1;
 			width: 100%;
 			.checkbox {

pages/users/user_address_list/index.vue

@@ -33,7 +33,7 @@
 			</view>
 			<view class='noCommodity' v-if="addressList.length < 1 && page > 1">
 				<view class='pictrue'>
-					<image src='../../../static/images/noAddress.png'></image>
+					<image src='http://ygs.hqgjsmc.com/baseimg/noAddress.png'></image>
 				</view>
 				<view>暂无地址</view>
 			</view>

pages/users/user_cash/index.vue

@@ -236,6 +236,11 @@
 					uni.setNavigationBarTitle({
 						title:'动态积分提现'
 					})
+				}
+				if(options.jftype == 3) {
+					uni.setNavigationBarTitle({
+						title:'权益积分提现'
+					})
 				}
 			} else {
                 this.isAuto = true;

pages/users/user_goods_collection/index.vue

@@ -33,7 +33,7 @@
 		</view>
 		<view class="noCommodity" v-else-if="!collectProductList.length && page > 1">
 			<view class="pictrue">
-				<image src="@/static/images/noCart.png"></image>
+				<image src="http://ygs.hqgjsmc.com/baseimg/noCart.png"></image>
 				<view>暂无商品，去添加点什么吧</view>
 			</view>
 

pages/users/user_info/index.vue

@@ -89,20 +89,23 @@
 							<text class='iconfont icon-you'></text>
 						</navigator>
 					</view> -->
-					<!-- <view class='item acea-row row-between-wrapper'>
+					<view class='item acea-row row-between-wrapper'>
 						<view>注销账号</view>
 						<view class='input acea-row row-between-wrapper' @click="changeCancel">
 							<input type='text' placeholder="账号注销后不能恢复" disabled='true' class='id'></input>
 							<text class='iconfont icon-you'></text>
 						</view>
-					</view> -->
+					</view>
 				</view>
 				<!-- #ifdef H5 -->
-				<view class="logOut acea-row row-center-wrapper" @click="outLogin" v-if="!this.$wechat.isWeixin()">退出登录</view>
+				<view class="logOut acea-row row-center-wrapper" @click="outLogin" v-if="!this.$wechat.isWeixin()" style="background: #1db0fc;color: #fff;">退出登录</view>
 				<!-- #endif -->
 				<!-- #ifdef MP || APP-PLUS -->
-				<view class="logOut acea-row row-center-wrapper" @click="outLogin">退出登录</view>
+				<view class="logOut acea-row row-center-wrapper" @click="outLogin" style="background: #1db0fc;color: #fff;">退出登录</view>
 				<!-- #endif -->	
+	<!-- 			<view class="logOut acea-row row-center-wrapper" @click="zx">
+					注销账号
+				</view> -->
 			</view>
 		</form>
 		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>

pages/users/user_money/index.vue

@@ -6,7 +6,7 @@
 				<view class="goback-box" @click="toBack"><image class="goback" src="../../../static/icon/fanhui.png" mode=""></image></view>
 				<view class="header">我的余额</view>
 			</view>
-			<view class="content-bg"><image src="../../../static/img/myyue.png" mode=""></image></view>
+			<view class="content-bg"><image src="http://ygs.hqgjsmc.com/baseimg/myyue.png" mode=""></image></view>
 			<view class="money-box">
 				<view class="money">{{ userInfo.now_money || 0 }}</view>
 				<view>我的余额</view>

pages/users/user_store_attention/index.vue

@@ -26,7 +26,7 @@
 		</view>
 		<view class='noCommodity' v-if="storeList.length == 0">
 			<view class='pictrue'>
-				<image src='../../../static/images/noCart.png'></image>
+				<image src='http://ygs.hqgjsmc.com/baseimg/noCart.png'></image>
 			</view>
 			<view class="empty-txt" >暂无数据</view>
 		</view>