123456

manifest.json

@@ -1,152 +1,154 @@
 {
-    "name" : "微乐种",
-    "appid" : "__UNI__CDE33A2",
-    "description" : "",
-    "versionName" : "1.1.3",
-    "versionCode" : 113,
-    "transformPx" : false,
-    "app-plus" : {
-        /* 5+App特有相关 */
-        "usingComponents" : true,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        "modules" : {
-            "Payment" : {}
-        },
-        /* 模块配置 */
-        "distribute" : {
-            /* 应用发布信息 */
-            "android" : {
-                /* android打包配置 */
-                "permissions" : [
-                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
-                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>"
-                ],
-                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
-            },
-            "ios" : {
-                "idfa" : false,
-                "capabilities" : {
-                    "entitlements" : {
-                        "com.apple.developer.associated-domains" : [ "applinks:static-f2ce8da9-3823-402a-bd21-675f08b3b09b.bspapp.com" ]
-                    }
-                },
-                "privacyDescription" : {
-                    "NSPhotoLibraryUsageDescription" : "使您上传个性化头像",
-                    "NSPhotoLibraryAddUsageDescription" : "使您上传个性化头像",
-                    "NSCameraUsageDescription" : "使用摄像头可以让你更好的上传个性化头像"
-                }
-            },
-            /* ios打包配置 */
-            "sdkConfigs" : {
-                "maps" : {},
-                "oauth" : {},
-                "geolocation" : {},
-                "payment" : {
-                    "weixin" : {
-                        "__platform__" : [ "ios", "android" ],
-                        "appid" : "wxc45bba547e921b9f",
-                        "UniversalLinks" : "https://static-f2ce8da9-3823-402a-bd21-675f08b3b09b.bspapp.com/uni-universallinks/__UNI__CDE33A2/"
-                    }
-                },
-                "push" : {},
-                "share" : {},
-                "speech" : {},
-                "statics" : {},
-                "ad" : {}
-            },
-            "icons" : {
-                "android" : {
-                    "hdpi" : "unpackage/res/icons/72x72.png",
-                    "xhdpi" : "unpackage/res/icons/96x96.png",
-                    "xxhdpi" : "unpackage/res/icons/144x144.png",
-                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
-                },
-                "ios" : {
-                    "appstore" : "unpackage/res/icons/1024x1024.png",
-                    "ipad" : {
-                        "app" : "unpackage/res/icons/76x76.png",
-                        "app@2x" : "unpackage/res/icons/152x152.png",
-                        "notification" : "unpackage/res/icons/20x20.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "proapp@2x" : "unpackage/res/icons/167x167.png",
-                        "settings" : "unpackage/res/icons/29x29.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "spotlight" : "unpackage/res/icons/40x40.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
-                    },
-                    "iphone" : {
-                        "app@2x" : "unpackage/res/icons/120x120.png",
-                        "app@3x" : "unpackage/res/icons/180x180.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "notification@3x" : "unpackage/res/icons/60x60.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "settings@3x" : "unpackage/res/icons/87x87.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
-                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
-                    }
-                }
-            },
-            "splashscreen" : {
-                "androidStyle" : "default",
-                "android" : {
-                    "hdpi" : "appbase/480.9.png",
-                    "xhdpi" : "appbase/720.9.png",
-                    "xxhdpi" : "appbase/1080.9.png"
-                },
-                "iosStyle" : "storyboard",
-                "ios" : {
-                    "storyboard" : "C:/Users/Administrator/Desktop/苹果/wlg.zip"
-                }
-            }
-        }
-    },
-    /* SDK配置 */
-    "quickapp" : {},
-    /* 快应用特有相关 */
-    "mp-weixin" : {
-        /* 小程序特有相关 */
-        "usingComponents" : true,
-        "appid" : "",
-        "setting" : {
-            "urlCheck" : true
-        }
-    },
-    "h5" : {
-        "title" : "微乐种s",
-        "domain" : "",
-        "router" : {
-            "base" : "/index/",
-            "mode" : "hash"
-        },
-        "devServer" : {
-            "proxy" : {
-                "/api" : {
-                    // "target" : "http://lnpt.frp.liuniu946.com/api",
-                    "target" : "http://wlgogo.cn/api",
-                    // "changeOrigin": true,
-                    "pathRewrite" : {
-                        "/api" : "" // rewrite path
-                    }
-                }
-            }
-        },
-        "sdkConfigs" : {
-            "maps" : {}
-        }
-    },
-    "_spaceID" : "f2ce8da9-3823-402a-bd21-675f08b3b09b"
+	"name": "微乐种",
+	"appid": "__UNI__CDE33A2",
+	"description": "",
+	"versionName": "1.1.3",
+	"versionCode": 113,
+	"transformPx": false,
+	"app-plus": {
+		/* 5+App特有相关 */
+		"usingComponents": true,
+		"splashscreen": {
+			"alwaysShowBeforeRender": true,
+			"waiting": true,
+			"autoclose": true,
+			"delay": 0
+		},
+		"modules": {
+			"Payment": {}
+		},
+		/* 模块配置 */
+		"distribute": {
+			/* 应用发布信息 */
+			"android": {
+				/* android打包配置 */
+				"permissions": [
+					"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.INTERNET\"/>",
+					"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>"
+				],
+				"abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"]
+			},
+			"ios": {
+				"idfa": false,
+				"capabilities": {
+					"entitlements": {
+						"com.apple.developer.associated-domains": [
+							"applinks:static-f2ce8da9-3823-402a-bd21-675f08b3b09b.bspapp.com"
+						]
+					}
+				},
+				"privacyDescription": {
+					"NSPhotoLibraryUsageDescription": "使您上传个性化头像",
+					"NSPhotoLibraryAddUsageDescription": "使您上传个性化头像",
+					"NSCameraUsageDescription": "使用摄像头可以让你更好的上传个性化头像"
+				}
+			},
+			/* ios打包配置 */
+			"sdkConfigs": {
+				"maps": {},
+				"oauth": {},
+				"geolocation": {},
+				"payment": {
+					"weixin": {
+						"__platform__": ["ios", "android"],
+						"appid": "wxc45bba547e921b9f",
+						"UniversalLinks": "https://static-f2ce8da9-3823-402a-bd21-675f08b3b09b.bspapp.com/uni-universallinks/__UNI__CDE33A2/"
+					}
+				},
+				"push": {},
+				"share": {},
+				"speech": {},
+				"statics": {},
+				"ad": {}
+			},
+			"icons": {
+				"android": {
+					"hdpi": "unpackage/res/icons/72x72.png",
+					"xhdpi": "unpackage/res/icons/96x96.png",
+					"xxhdpi": "unpackage/res/icons/144x144.png",
+					"xxxhdpi": "unpackage/res/icons/192x192.png"
+				},
+				"ios": {
+					"appstore": "unpackage/res/icons/1024x1024.png",
+					"ipad": {
+						"app": "unpackage/res/icons/76x76.png",
+						"app@2x": "unpackage/res/icons/152x152.png",
+						"notification": "unpackage/res/icons/20x20.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
+						"proapp@2x": "unpackage/res/icons/167x167.png",
+						"settings": "unpackage/res/icons/29x29.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
+						"spotlight": "unpackage/res/icons/40x40.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png"
+					},
+					"iphone": {
+						"app@2x": "unpackage/res/icons/120x120.png",
+						"app@3x": "unpackage/res/icons/180x180.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
+						"notification@3x": "unpackage/res/icons/60x60.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
+						"settings@3x": "unpackage/res/icons/87x87.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png",
+						"spotlight@3x": "unpackage/res/icons/120x120.png"
+					}
+				}
+			},
+			"splashscreen": {
+				"androidStyle": "default",
+				"android": {
+					"hdpi": "appbase/480.9.png",
+					"xhdpi": "appbase/720.9.png",
+					"xxhdpi": "appbase/1080.9.png"
+				},
+				"iosStyle": "storyboard",
+				"ios": {
+					"storyboard": "C:/Users/Administrator/Desktop/苹果/wlg.zip"
+				}
+			}
+		}
+	},
+	/* SDK配置 */
+	"quickapp": {},
+	/* 快应用特有相关 */
+	"mp-weixin": {
+		/* 小程序特有相关 */
+		"usingComponents": true,
+		"appid": "",
+		"setting": {
+			"urlCheck": true
+		}
+	},
+	"h5": {
+		"title": "微乐种s",
+		"domain": "",
+		"router": {
+			"base": "/index/",
+			"mode": "hash"
+		},
+		"devServer": {
+			"proxy": {
+				"/api": {
+					// "target" : "http://lnpt.frp.liuniu946.com/api",
+					"target": "http://wlgogo.cn/api",
+					// "changeOrigin": true,
+					"pathRewrite": {
+						"/api": "" // rewrite path
+					}
+				}
+			}
+		},
+		"sdkConfigs": {
+			"maps": {}
+		}
+	},
+	"_spaceID": "f2ce8da9-3823-402a-bd21-675f08b3b09b"
 }

pages/product/product.vue

@@ -12,7 +12,7 @@
 				</view>
 				<text class="iconfont iconenter"></text>
 			</view>
-			<view class="c-row b-b" v-if="goodsObjact.white_integral != 0">
+			<!-- <view class="c-row b-b" v-if="goodsObjact.white_integral != 0">
 				<text>每购买一个送{{ goodsObjact.white_integral }}肥料</text>
 			</view>
 			<view class="c-row b-b" v-if="goodsObjact.give_integral != 0">
@@ -20,7 +20,7 @@
 			</view>
 			<view class="c-row b-b" v-if="goodsObjact.business_integral != 0">
 				<text>每购买一个送{{ goodsObjact.business_integral }}商家积分</text>
-			</view>
+			</view> -->
 		</view>
 		<!-- 拼货时间及优惠 -->
 		<!-- <discounts @clickCoupon="Getcoupon" :Info="goodsObjact.store_info" :showCoupon="true"></discounts> -->

pages/public/register.vue

@@ -23,7 +23,7 @@
 			<input class="input-box" type="password" v-model="payPass" placeholder="请输入6位数的交易密码" />
 		</view> -->
 		<view class="login-box">
-			<view class="username">邀请码</view>
+			<view class="username">邀请码(选填)</view>
 			<input class="input-box" type="text" v-model="invitation" placeholder="请输入邀请码" />
 		</view>
 		<label class="two" @click="checkboxChange">
@@ -87,10 +87,10 @@ export default {
 				obj.$api.msg('请输入验证码');
 				return;
 			}
-			if (obj.invitation == '') {
-				obj.$api.msg('请输入邀请码');
-				return;
-			}
+			// if (obj.invitation == '') {
+			// 	obj.$api.msg('请输入邀请码');
+			// 	return;
+			// }
 			if (!obj.istype) {
 				obj.$api.msg('请查看并同意用户协议和隐私政策');
 				return;

pages/user/team.vue

@@ -1,42 +1,69 @@
 <template>
 	<view class="content">
 		<view class="status_bar"><!-- 这里是状态栏 --></view>
-		<view class="" style="height: 20rpx;"></view>
+		<view class="" style="height: 20rpx;">
+			
+		</view>
 		<view class="user-top flex">
-			id: {{ userInfo.uid }}
-			<text style="margin-left: 20rpx;" class="clamp">昵称:{{ userInfo.nickname }}</text>
+			id: {{userInfo.uid}}<text style="margin-left: 20rpx;" class="clamp">昵称:{{userInfo.nickname}}</text>
 		</view>
 		<view class="yeji-wraper flex">
 			<view class="yeji-item">
-				<view class="yeji-val">{{ wlgsbList.price || '0' }}</view>
-				<view class="yeji-name">销售业绩</view>
+				<view class="yeji-val">
+					{{wlgsbList.price || '0'}}
+				</view>
+				<view class="yeji-name">
+					销售业绩
+				</view>
 			</view>
 			<view class="yeji-item">
-				<view class="yeji-val">{{ wlgsbList.today_price || '0' }}</view>
-				<view class="yeji-name">今日业绩</view>
+				<view class="yeji-val">
+					{{wlgsbList.today_price || '0'}}
+				</view>
+				<view class="yeji-name">
+					今日业绩
+				</view>
 			</view>
 			<view class="yeji-item">
-				<view class="yeji-val">{{ wlgsbList.yesterday_price || '0' }}</view>
-				<view class="yeji-name">昨日业绩</view>
+				<view class="yeji-val">
+					{{wlgsbList.yesterday_price || '0'}}
+				</view>
+				<view class="yeji-name">
+					昨日业绩
+				</view>
 			</view>
 		</view>
 		<view class="nav-wraper flex">
-			<view class="nav-item" v-for="(nitem, nindex) in navList" :class="{ action: nindex == tabCurrentIndex }" @click="navClick(nindex)">{{ nitem.text }}</view>
+			<view class="nav-item" v-for="(nitem,nindex) in navList" :class="{'action':nindex == tabCurrentIndex}" @click="navClick(nindex)">
+				{{nitem.text}}
+			</view>
 		</view>
 		<template v-if="tabCurrentIndex == 0">
 			<view class="wlg-sb flex" style="margin-top: 40rpx;" @click="navto('/pages/user/teamList?key=direct_push')">
-				<view class="">服务直属消费者</view>
-				<view class="">{{ wlgsbList.direct_push_count || '0' }}</view>
+				<view class="">
+					服务直属消费者
+				</view>
+				<view class="">
+					{{wlgsbList.direct_push_count || '0'}}
+				</view>
 			</view>
 			<view class="wlg-sb flex" @click="navto('/pages/user/teamList?key=between')">
-				<view class="">服务体系消费者</view>
-				<view class="">{{ wlgsbList.between_count || '0' }}</view>
+				<view class="">
+					服务体系消费者
+				</view>
+				<view class="">
+					{{wlgsbList.between_count || '0'}}
+				</view>
 			</view>
 		</template>
-		<template v-if="tabCurrentIndex == 1">
-			<view class="wlg-sb flex" style="margin-top: 40rpx;" @click="navto('/pages/user/teamList?key=user_list')">
-				<view class="">服务茶农</view>
-				<view class="">{{ wlgsbList.user_count || '0' }}</view>
+		<template  v-if="tabCurrentIndex == 1">
+			<view class="wlg-sb flex" style="margin-top: 40rpx;"  @click="navto('/pages/user/teamList?key=user_list')">
+				<view class="">
+					服务茶农
+				</view>
+				<view class="">
+					{{wlgsbList.user_count || '0'}}
+				</view>
 			</view>
 			<!-- <view class="wlg-sb flex">
 				<view class="">
@@ -101,7 +128,7 @@ export default {
 	methods: {
 		...mapMutations(['setSbList']),
 		navClick(index) {
-			this.tabCurrentIndex = index;
+			this.tabCurrentIndex = index
 		},
 		// 页面跳转
 		navto(e) {
@@ -111,10 +138,10 @@ export default {
 		},
 		//获取收入支出信息
 		async loadData(source) {
-			let obj = this;
+			let obj = this
 			tuiguang().then(res => {
 				console.log(res, 'data');
-				obj.setSbList(res.data);
+				obj.setSbList(res.data)
 			});
 		},
 		// 点击返回 我的页面
@@ -129,7 +156,7 @@ export default {
 
 <style lang="scss">
 page {
-	background: #fff;
+	background: #f8f8f8;
 	height: 100%;
 }
 
@@ -173,10 +200,11 @@ page {
 // 	}
 // }
 
-.status_bar {
-	height: var(--status-bar-height);
-	width: 100%;
-}
+// .status_bar {
+// 	height: var(--status-bar-height);
+// 	width: 100%;
+// 	background: #5dbc7c;
+// }
 
 // .content-money {
 // 	position: relative;
@@ -432,7 +460,7 @@ page {
 	width: 680rpx;
 	height: 80rpx;
 	line-height: 80rpx;
-	box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.2);
+	box-shadow: 0 0 10rpx rgba(0,0,0,0.2);
 	margin: 20rpx auto;
 	border-radius: 8rpx;
 	padding: 0 30rpx;
@@ -442,8 +470,8 @@ page {
 .yeji-wraper {
 	width: 590rpx;
 	height: 134rpx;
-	box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.2);
-	margin: 20rpx auto;
+	box-shadow: 0 0 10rpx rgba(0,0,0,0.2);
+	margin:20rpx auto;
 	border-radius: 10rpx;
 	text-align: center;
 	font-size: 28rpx;
@@ -452,13 +480,14 @@ page {
 		.yeji-val {
 			padding-bottom: 20rpx;
 			font-weight: bold;
+			
 		}
 	}
 }
 .nav-wraper {
 	width: 630rpx;
 	height: 80rpx;
-	box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.2);
+	box-shadow: 0 0 10rpx rgba(0,0,0,0.2);
 	margin: auto;
 	border-radius: 15rpx;
 	.nav-item {
@@ -477,7 +506,7 @@ page {
 .wlg-sb {
 	width: 590rpx;
 	height: 140rpx;
-	box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.2);
+	box-shadow: 0 0 10rpx rgba(0,0,0,0.2);
 	margin: 20rpx auto;
 	border-radius: 10rpx;
 	padding: 20rpx;

pages/user/user.vue

@@ -31,10 +31,10 @@
 				</view>
 			</view> -->
 		</view>
-		<view class="item-box" v-if="userInfo.uid">
+		<view class="item-box">
 			<view class="order-section">
 				<view class="order-item" @click="navTo('/pages/user/whiteJf')" hover-class="common-hover" :hover-stay-time="50">
-					<view class="icon"><image class="icon-img" src="../../static/game/game03.png" mode="aspectFit"></image></view>
+					<view class="icon"><image class="icon-img" src="/static/icon/myyj.png" mode="aspectFit"></image></view>
 					<text>我的肥料</text>
 				</view>
 				<view class="order-item" @click="navTo('/pages/user/mallJf')" hover-class="common-hover" :hover-stay-time="50">
@@ -98,11 +98,11 @@
 			<view class="">我的收藏</view>
 			<image src="../../static/icon/goto.png" mode="widthFix" class="right-img"></image>
 		</view>
-		<view class="btm-box flex" @click="navTo('/pages/user/shareQrCode')">
+		<!-- <view class="btm-box flex" @click="navTo('/pages/user/shareQrCode')">
 			<image src="../../static/icon/tghb.png" mode="widthFix" class="left-img"></image>
 			<view class="">推广海报</view>
 			<image src="../../static/icon/goto.png" mode="widthFix" class="right-img"></image>
-		</view>
+		</view> -->
 		<view class="btm-box flex" @click="navTo('/pages/set/address')">
 			<image src="../../static/icon/shdz.png" mode="widthFix" class="left-img"></image>
 			<view class="">收货地址</view>

unpackage/cache/apk/apkurl

@@ -1 +1,5 @@
-https://ide.dcloud.net.cn/build/download/121ade50-eee6-11ec-ae6d-ddb7b406c94f
+<<<<<<< HEAD
+https://ide.dcloud.net.cn/build/download/121ade50-eee6-11ec-ae6d-ddb7b406c94f
+=======
+https://ide.dcloud.net.cn/build/download/6db09c70-ee1c-11ec-b2e9-891387a8e105
+>>>>>>> 91dc169b5ba56666d2aa341d9ed575571008f75d