2022-3-16

App.vue

@@ -45,13 +45,14 @@ export default {
 			// 保存当前是否为微信内核浏览器
 			uni.setStorageSync('weichatBrowser', bool);
 		}
-		if (bool) {
-			// 加载微信信息
-			weixindata();
-		}
+		// if (bool) {
+		// 	// 加载微信信息
+		// 	weixindata();
+		// }
 		// #endif
 		// #ifdef APP-PLUS
 		// 判断是否升级
+		console.log('开始');
 		getUpApp();
 		// 获取当前运行系统
 		let system = uni.getStorageSync('platform') || '';

api/user.js

@@ -16,6 +16,14 @@ export function nickname(data) {
 		data
 	});
 }
+export function upApp(data) {
+	return request({
+		url: '/api/version',
+		method: 'get',
+		data
+	});
+}
+
 export function transfer(data) {
         return request({
                 url: '/api/transfer',

manifest.json

@@ -2,8 +2,8 @@
     "name" : "万吉商城",
     "appid" : "__UNI__F0EBD91",
     "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
+    "versionName" : "1.1.0",
+    "versionCode" : 110,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */
@@ -14,25 +14,20 @@
             "autoclose" : true,
             "delay" : 0
         },
-        "modules" : {},
+        "modules" : {
+            "Payment" : {}
+        },
         /* 模块配置 */
         "distribute" : {
             /* 应用发布信息 */
             "android" : {
                 /* android打包配置 */
                 "permissions" : [
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
                     "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
-                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>"
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>"
                 ],
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
             },
@@ -48,7 +43,55 @@
                         "appsecret" : "",
                         "UniversalLinks" : ""
                     }
+                },
+                "geolocation" : {},
+                "payment" : {},
+                "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" : "C:/Users/Administrator/Desktop/万吉/启动图480.png",
+                    "xhdpi" : "C:/Users/Administrator/Desktop/万吉/启动图720.png",
+                    "xxhdpi" : "C:/Users/Administrator/Desktop/万吉/启动图1080.png"
+                },
+                "iosStyle" : "common"
             }
         }
     },
@@ -73,7 +116,7 @@
         "devServer" : {
             "proxy" : {
                 "/api" : {
-                    "target" : "http://gp.frp.liuniu946.com/api",
+                    "target" : "http://gp.liuniu946.com/api",
                     // "changeOrigin": true,
                     "pathRewrite" : {
                         "/api" : "" // rewrite path

pages.json

@@ -46,7 +46,7 @@
 		{
 			"path": "pages/index/shopList",
 			"style": {
-				"navigationBarTitleText": "抢购商品"
+				"navigationBarTitleText": "公排商品"
 			}
 		},
 		{
@@ -327,7 +327,7 @@
 		{
 			"path": "pages/set/phone",
 			"style": {
-				"navigationBarTitleText": "实名认证"
+				"navigationBarTitleText": "绑定手机号"
 			}
 		},
 		{
@@ -548,7 +548,16 @@
 				"navigationBarTitleText": "邀请好友"
 			}
 		}
-	],
+	    ,{
+            "path" : "pages/public/download",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
 	"subPackages": [{
 		"root": "pages/activity",
 		"name": "activity",

pages/index/gongyiList.vue

@@ -1,7 +1,6 @@
 <template>
 	<view class="main">
-		<view class="list-box-h">
-			<empty v-if="loaded === true && list.length == 0"></empty>
+		<view class="list-box-h">
 			<view v-for="(item, index) in list" :key="index" class="guess-item" @click="navToDetailPage(item)">
 				<image :src="item.image"></image>
 				<view class="guess-box">
@@ -24,22 +23,17 @@
 	</view>
 </template>
 
-<script>
-	import empty from '@/components/empty';
+<script>
 	import {
 		getProducts
 	} from '@/api/product.js';
-	export default {
-		components: {
-			empty
-		},
+	export default {
 		data() {
 			return {
 				list: [],
 				page: 1,
 				limit: 10,
-				loadingType: 'more',
-				loaded: false
+				loadingType: 'more',
 			}
 		},
 		onLoad(opt) {
@@ -75,8 +69,7 @@
 						obj.loadingType = 'more'
 					} else {
 						obj.loadingType = 'noMore'
-					}
-					obj.loaded = true
+					}
 				})
 			}
 		}

pages/index/index.vue

@@ -327,7 +327,7 @@
 			</view>
 		</view> -->
 		<view class="Mask" v-show="shareShow">
-			<image @click="share" src="http://shicai.liuniu946.com/static/img/shareimg4.png"></image>
+			<!-- <image @click="share" src="http://shicai.liuniu946.com/static/img/shareimg4.png"></image> -->
 			<view class="Toshare" @click="Toshare"></view>
 			<view class="Tocancel" @click="Tocancel"></view>
 		</view>
@@ -647,9 +647,14 @@
 			},
 			//轮播图切换修改背景色
 			swiperChange(e) {
-				const index = e.detail.current;
-				this.swiperCurrent = index;
-				this.titleNViewBackground = this.carouselList[index].background;
+				console.log('e',e);
+				try{
+					const index = e.detail.current;
+					this.swiperCurrent = index;
+					this.titleNViewBackground = this.carouselList[index].background;
+				}catch(e){
+					console.log(e,'轮播错误');
+				}
 			},
 			//详情页
 			navToDetailPage(item) {

pages/money/pay.vue

@@ -55,7 +55,7 @@ import { createOrderkey,computedOrderkey,orderPay } from '@/api/order.js';
 import { getUserInfo } from '@/api/user.js';
 import { mapState } from 'vuex';
 // #ifdef H5
-import weixinBJ from "@/utils/wxAuthorized.js";
+import weixinObj from "@/plugin/jweixin-module/index.js";
 // #endif
 export default {
 	data() {
@@ -80,7 +80,7 @@ export default {
 			pinkid: '' ,//保存拼团商品id
 			'gp_now_money':0,
 			'integral':0,
-			is_gp:0,//1为公排0不是公排
+			is_gp:0,//1为公排0不是公排
 			bool: true
 		};
 	},
@@ -88,7 +88,7 @@ export default {
 		this.bool = uni.getStorageSync('weichatBrowser');
 		if(!this.bool) {
 			this.payType = 3
-			this.payName = 'yue'
+			this.payName = 'yue'
 		}
 		if (options.type == 1) {
 			this.type = 1;
@@ -182,8 +182,7 @@ export default {
 							obj.$api.msg(msg);
 						}
 					}
-					if (obj.payName == 'weixin' || obj.payName == 'routine') {
-						console.log("开始调用");
+					if (obj.payName == 'weixin' || obj.payName == 'routine') {
 						let da = e.data.result.jsConfig;
 						let data = {
 							// #ifdef H5
@@ -199,26 +198,15 @@ export default {
 							success: function(res) {
 								obj.paySuccessTo();
 							},
-							fail: (e) => {
-								uni.showModal({
-									title: '错误',
-									content: e,
+							fail: () => {
+								uni.navigateTo({
+									url: '/pages/order/order?state=0'
 								});
-								// uni.navigateTo({
-								// 	url: '/pages/order/order?state=0'
-								// });
 							}
 						};
 						// #ifdef H5
-						if(obj.payName == 'weixin'){
-							weixinBJ.weixinObj.chooseWXPay(data);
-							// weixindata().then(() => {
-							// }).catch((e) => {
-							// 	uni.showModal({
-							// 		title: '错误',
-							// 		content: e,
-							// 	});
-							// })
+						if(obj.payName == 'weixin'){
+weixinObj.chooseWXPay(data);
 						}
 						// #endif
 						// #ifdef MP-WEIXIN

pages/money/paySuccess.vue

@@ -3,7 +3,7 @@
 		<text class="success-icon iconfont iconroundcheck"></text>
 		<text class="tit">支付成功</text>
 		<view class="btn-group">
-			<navigator :url="'/pages/order/orderDetail?id='+orderId" open-type="redirect" class="mix-btn">查看订单</navigator>
+			<!-- <navigator :url="'/pages/order/orderDetail?id='+orderId" open-type="redirect" class="mix-btn">查看订单</navigator> -->
 			<navigator url="/pages/index/index" open-type="switchTab" class="mix-btn hollow">返回首页</navigator>
 		</view>
 	</view>

pages/money/recharge.vue

@@ -15,7 +15,7 @@
 		<view class="list">
 					<radio-group @change="tabRadio">
 						<!-- #ifndef APP-PLUS -->
-						<label v-if="bool">
+						<!-- <label>
 							<view class="box">
 								<view class="icon iconfont iconweixin1"></view>
 								<view class="title-box">
@@ -23,10 +23,10 @@
 								</view>
 								<view class="right"><radio value="weixin" color=" #456ffb" :checked="type == 'weixin'" /></view>
 							</view>
-						</label>
+						</label> -->
 						<!-- #endif -->
 						<!-- #ifdef APP-PLUS -->
-						<label>
+						<!-- <label>
 							<view class="box">
 								<view class="icon iconfont iconzhifubao"></view>
 								<view class="title-box">
@@ -34,14 +34,14 @@
 								</view>
 								<view class="right"><radio value="ali" color=" #456ffb" :checked="type == 'ali'" /></view>
 							</view>
-						</label>
+						</label> -->
 						<!-- #endif -->
 						<label>
 							<view class="box">
 								<view class="icon iconfont"><image class="yongjing" src="http://xmpt.liuniu946.com/img/yongjing.png"></image></view>
 								<view class="title-box">
 									<view class="title"><text>佣金充值</text></view>
-									<view class="node">可用佣金￥{{ yongMoney }}</view>
+									<view class="node">可用佣金￥{{ yongMoney?yongMoney:0 }}</view>
 								</view>
 								<view class="right"><radio value="yongjing" color=" #456ffb" :checked="type == 'yongjing'" /></view>
 							</view>
@@ -57,7 +57,7 @@
 import { getMoneyStyle } from '@/utils/rocessor.js';
 // #ifdef H5
 import { rechargeWechat,userBalance,extractBank} from '@/api/wallet.js';
-import weixinBJ from "@/utils/wxAuthorized.js";
+import weixinObj from "@/plugin/jweixin-module/index.js";
 // #endif
 // #ifdef MP
 import { rechargeRoutine } from '@/api/wallet.js';
@@ -68,15 +68,27 @@ export default {
 		getMoneyStyle
 	},
 	data() {
-		return {
-			type: 'weixin',
+		return {
+			// #ifdef H5
+			type: 'yongjing',
+			// #endif
+			// #ifndef  H5
+			type: 'weixin',
+			// #endif
 			money: '', //充值金额
 			payLoding: false ,//是否加载中
 			yongMoney:'',
-			nowmoney:'',
-			bool: true
+			nowmoney:'',
+			typeText:1//默认支付方式
+			
 			
 		};
+	},
+	watch: {
+		type(newValue, oldValue) {
+			console.log(newValue);
+			console.log(oldValue);
+		}
 	},
 	onShow() {
 		this.yongMoney = ''
@@ -90,14 +102,7 @@ export default {
 			this.disable= true
 		});
 	},
-	onLoad(options) {
-		this.bool = uni.getStorageSync('weichatBrowser');
-		if(!this.bool) {
-			// this.payType = 3
-			this.type = 'yongjing'
-			this.typeText = 1
-		}
-	},
+	onLoad(options) {},
 	computed: {
 		// #ifdef H5
 		...mapState(['weichatObj'])
@@ -112,7 +117,7 @@ export default {
 		},
 	// 切换选中对象
 	tabRadio(e) {
-		console.log(e);
+		console.log(e,'选中');
 		if (e.detail.value == 'weixin') {
 			this.typeText = 0;
 		}
@@ -126,7 +131,7 @@ export default {
 		this.type = e.target.value
 		// #endif
 		// #ifndef APP-PLUS
-		this.type = e;
+		this.type = e.detail.value;
 		// #endif
 		console.log(this.typeText);
 	},
@@ -195,35 +200,93 @@ export default {
 				obj.$api.msg('请输入充值金额');
 				obj.payLoding = false;
 				return;
+			}
+			if (obj.typeText == null) {
+				obj.$api.msg('请选择充值方式');
+				obj.payLoding = false;
+				return;
 			}
-			if (obj.type == 'yongjin' && obj.money > parseInt(obj.yongMoney)) {
+			if (obj.type == 'yongjing' && obj.money > parseInt(obj.yongMoney)) {
 				obj.$api.msg('佣金不足');
 				obj.payLoding = false;
 				return;
 			}
-			obj.payLoding = true
+			obj.payLoding = true
+			// 	// #ifdef H5
+			// 	rechargeWechat({ price: this.money, from: this.type })
+			// 		.then(e => {
+			// 			let da = e.data.data;
+			// 			obj.weichatObj.chooseWXPay({
+			// 				timestamp: da.timestamp,
+			// 				nonceStr: da.nonceStr,
+			// 				package: da.package,
+			// 				signType: da.signType,
+			// 				paySign: da.paySign,
+			// 				success: function(res) {
+			// 					uni.showToast({
+			// 						title: '充值成功',
+			// 						duration: 2000,
+			// 						position: 'top'
+			// 					});
+			// 				}
+			// 			});
+			// 			obj.payLoding = false;
+			// 		})
+			// 		.catch(e => {
+			// 			obj.payLoding = false;
+			// 			console.log(e);
+			// 		});
+			// 	// #endif
+			// 	// #ifdef MP
+			// 	rechargeRoutine({ price: this.money})
+			// 		.then(e => {
+			// 			let da = e.data;
+			// 				wx.requestPayment({
+			// 						timeStamp: da.timestamp,
+			// 						nonceStr: da.nonceStr,
+			// 						package: da.package,
+			// 						signType: da.signType,
+			// 						paySign: da.paySign,
+			// 						success: function(res) {
+			// 							uni.redirectTo({
+			// 								url: '/pages/money/paySuccess'
+			// 							});
+			// 						},
+									
+			// 					})
+						
+			// 			obj.payLoding = false;
+			// 		})
+			// 		.catch(e => {
+			// 			obj.payLoding = false;
+			// 			console.log(e);
+			// 		});
+			// 	// #endif
 			// #ifdef APP-PLUS
-			const pushDate = { price: this.money, from:this.typeText==2?'ali':'yongjing', type: this.typeText  }
-			console.log(pushDate);
+			const pushDate = { price: this.money, from:this.typeText==1?'yongjing':'ali', type: this.typeText  }
+			console.log(pushDate,'徐浩岚');
 			rechargeWechat(pushDate)
 				.then(e => {
 					console.log(e,'返回数据');
 					let da = e.data;
-					obj.money = '';
-					obj.yongMoney = ''
+					// obj.money = '';
+					// obj.yongMoney = ''
 					console.log(obj.type,'ali');
-					if (obj.type == 'ali') {
+					if (obj.type == 'yongjing') {
 						const url = e.data.data;
 						console.log(url,'url');
 						uni.requestPayment({
 							provider: 'alipay',
 							orderInfo: url,
 							success: res => {
-								console.log(res);
+								console.log(res,'22222323232');
 								uni.showToast({
 									title: '充值成功',
 									duration: 2000,
-								});
+								});
+								uni.navigateTo({
+									url:'./paySuccess'
+								})
 							},
 							fail: e => {
 								console.log(e);
@@ -233,19 +296,10 @@ export default {
 						obj.payLoding = false;
 					}
 					if (obj.type == 'yongjing') {
-						// uni.navigateTo({
-						// 	url: '/pages/money/rechargeSuccess'
-						// });
-						obj.payLoding = false;
-						uni.showToast({
-							title: '充值成功',
-							duration: 2000,
-						});
-						extractBank({}).then(({ data }) => {
-							obj.yongMoney = (data.commissionCount * 1).toFixed(2); //累积佣金
-							console.log(data,'wwwww');
-							obj.disable= true
+						uni.navigateTo({
+							url: '/pages/money/rechargeSuccess'
 						});
+						obj.payLoding = false;
 						console.log(e, '佣金');
 					}
 				})
@@ -263,7 +317,8 @@ export default {
 					console.log(e);
 					if (obj.type == 'weixin') {
 						let da = e.data.data;
-						weixinBJ.weixinObj.chooseWXPay({
+						console.log(weixinObj, 'weixin');
+						weixinObj.chooseWXPay({
 							timestamp: da.timestamp,
 							nonceStr: da.nonceStr,
 							package: da.package,
@@ -278,11 +333,16 @@ export default {
 							}
 						});
 						obj.payLoding = false;
-					}
+					}
+					console.log(obj.type,'当前',obj.type == 'yongjing');
 					if (obj.type == 'yongjing') {
 						obj.yongMoney = ''
 						uni.navigateTo({
-							url: '/pages/money/rechargeSuccess'
+							url: './paySuccess',
+							
+							fail(e) {
+								console.log(e,'错误');
+							}
 						});
 						obj.payLoding = false;
 						console.log(e, '佣金');

pages/money/withdrawal.vue

@@ -22,6 +22,7 @@
 				<view class="buttom" @click="withdrawal = money">全部提现</view>
 			</view>
 		</view>
+		
 		<!-- #ifndef MP-WEIXIN -->
 		<view class="list" v-if="!weichatBsrowser">
 			<radio-group @change="tabRadio">

pages/order/orderRefund.vue

@@ -87,8 +87,7 @@ export default {
 			});
 		},
 		//提交
-		confirm() {
-			let obj = this;
+		confirm() {
 			if (!obj.refund) {
 				uni.showModal({
 					title: '错误',
@@ -97,7 +96,7 @@ export default {
 				});
 				return false;
 			}
-			
+			let obj = this;
 			refund({
 				text: obj.refund,
 				uni: obj.orderId,

pages/product/jfproduct.vue

@@ -96,10 +96,9 @@
 <script>
 import { goodsDetail, cartAdd, getJfDetail, getBl } from '@/api/product.js';
 import { jfOrderCreate } from '@/api/order.js'
-import { mapState,mapMutations } from 'vuex';
+import { mapState } from 'vuex';
 import store from '@/store/index.js';
 import { saveUrl } from '@/utils/loginUtils.js';
-import { getUserInfo } from '@/api/user.js'
 import uniNumberBox from '@/components/uni-number-box.vue';
 // #ifdef H5
 import { weixindata } from '@/utils/wxAuthorized';
@@ -257,7 +256,6 @@ export default {
 		return shareObj;
 	},
 	methods: {
-		...mapMutations('user',['setUserInfo']),
 		getBl(){
 			let obj = this
 			getBl().then(res => {
@@ -473,11 +471,11 @@ export default {
 			 console.log(obj.addressData,'addressData')
 			
 			// 判断用户积分是否足够
-			if(obj.userInfo){
-				if(obj.userInfo.integral*1 < ((((obj.actionPrice*1)*(obj.goodsNumber*1))*(obj.three_integral*1)).toFixed(2) + obj.goodsObjact.express_fee*1)){
-					return obj.$api.msg('您的积分不足！')
-				}
-			}
+			// if(obj.userInfo){
+			// 	if(obj.userInfo.integral*1 < (obj.goodsObjact.express_fee*1 + (obj.goodsObjact.price*1)*(obj.goodsNumber*1))){
+			// 		return obj.$api.msg('您的积分不足！')
+			// 	}
+			// }
 			let senddata = {
 				real_name: obj.addressData.real_name,
 				user_phone: obj.addressData.phone,
@@ -497,10 +495,6 @@ export default {
 			jfOrderCreate(senddata).then(res => {
 				console.log(res,'res+++++++++++++++++++++')
 				this.$api.msg('您已购买成功！')
-				getUserInfo({}).then((e) => {
-					// 保存返回用户数据
-					obj.setUserInfo(e.data);
-				})
 			})
 		}
 	}

pages/product/product.vue

@@ -323,7 +323,6 @@ export default {
 				} //小程序商品详情图超出屏幕问题
 				obj.imgList = goods.slider_image; //保存轮播图
 				obj.specList = data.productAttr; //保存分类列表
-				obj.goodsStore = goods.stock
 				if (Array.isArray(data.productValue) != true) {
 					obj.many = 2;
 					obj.specList = data.productAttr; //保存产品属性

pages/public/download.vue

@@ -0,0 +1,71 @@
+<template>
+	<view class="content">
+		<view class="bg">
+			<image src="../../static/img/xiazai.png" mode=""></image>
+		</view>
+		<view class="download" @click="navTo()">
+			Android下载
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			};
+		},
+		methods:{
+			navTo(){
+				uni.downloadFile(
+				{
+					url:'http://gp.liuniu946.com/public/wap',
+					success: (res) => {
+						 if (res.statusCode === 200) {
+						            console.log('下载成功');
+						        }
+					}
+				}
+				)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page, .content{
+		width: 100%;
+		height: 100%;
+		padding: 0;
+		margin: 0;
+		.bg{
+			width: 750rpx;
+			height: 100%;
+			image{
+				width: 100%;
+				height: 100%;
+			}
+		}
+		.download{
+			width: 500rpx;
+			height: 80rpx;
+			font-size: 34rpx;
+			font-weight: 500;
+			color: #19BE6B;
+			line-height: 80rpx;
+			position: absolute;
+			bottom: 0;
+			display: flex;
+			justify-content: center;
+			text-align: center;
+			border: 2rpx solid #19BE6B;
+			border-radius: 40rpx;
+			margin-bottom: 200rpx;
+			left: 125rpx;
+			
+		}
+	} 
+
+</style>

pages/public/login.vue

@@ -16,21 +16,21 @@
 			<view><button type="green" class="uni-button uni-button-green" @click="toLogin">登录</button></view>
 			<view><button type="green" class="uni-button uni-button-green uni-button-green-plain" plain="true" hover-class="none" @click="register">注册</button></view>
 			<navigator url="./forget"><view class="forget">忘记密码</view></navigator>
-			<view class="flex other">
+			<!-- <view class="flex other">
 				<view class="fenge"></view>
 				<view class="qita">其他方式登录</view>
 				<view class="fenge"></view>
-			</view>
-			<!-- #ifndef APP-PLUS -->
-					<view class="weixin" @click="wecahtLogin"><image src="/static/img/img05.png"></image></view>
-					<view class="weixin_text" @click="wecahtLogin">微信登录</view>
-					<!-- #endif -->
-					<!-- #ifdef APP-PLUS -->
-					<block v-if="!is_ios">
+			</view> -->
+		  <!-- <!-- 	#ifndef APP-PLUS -->-->
+					<!-- <view class="weixin" @click="wecahtLogin"><image src="/static/img/img05.png"></image></view>
+					<view class="weixin_text" @click="wecahtLogin">微信登录</view> -->
+					  <!--<!-- #endif -->-->
+					  <!--<!-- #ifdef APP-PLUS -->  -->
+					<!-- <block v-if="!is_ios">
 						<view class="weixin" @click="wecahtLogin"><image src="/static/img/img05.png" mode="scaleToFill"></image></view>
 						<view class="weixin_text" @click="wecahtLogin">微信登录</view>
-					</block>
-					<block v-else>
+					</block> -->
+					<!-- <block v-else>
 						<view class="ios_login flex" @click="wecahtLogin('weixin')">
 							<text class="iconfont iconweixin"></text>
 							<text class="weixin_text">微信登录</text>
@@ -39,8 +39,8 @@
 							<image class="loginIcon" src="/static/icon/appleIcon.png" mode=" scaleToFill"></image>
 							<text class="weixin_text">通过Apple登录</text>
 						</view>
-					</block>
-					<!-- #endif -->
+					</block> -->
+				   <!--	<!-- #endif -->-->
 				</view>
 			</view>
 </template>
@@ -112,6 +112,18 @@ export default {
 											obj.login();
 											// 保存返回用户数据
 											obj.setUserInfo(e.data);
+											if(!e.data.phone){
+												uni.showModal({
+												    title: '提示',
+												    showCancel:false,
+													content:'请绑定手机号', 
+													success() {
+														uni.navigateTo({
+															url:'/pages/set/phone'
+														})
+													}
+												});
+											}
 											//成功跳转首页
 											uni.switchTab({
 												url: '/pages/index/index'

pages/public/register.vue

@@ -17,7 +17,7 @@
 				<view class="login_img"><image src="/static/icon/img04.png"></image></view>
 				<view class="login_name"><input class="uni-input" type="password" v-model="repassword" focus placeholder="请重复输入密码" /></view>
 			</view>
-			<view class="login_input flex" style="display: none;">
+			<view class="login_input flex" >
 				<view class="login_img"><image src="/static/icon/img07.png"></image></view>
 				<view class="login_name"><input class="uni-input" type="text" v-model="invitation" focus placeholder="请输入邀请码" /></view>
 			</view>
@@ -83,10 +83,10 @@ export default {
 				obj.$api.msg('两次密码不正确');
 				return;
 			}
-			// if ((obj.invitation = '')) {
-			// 	obj.$api.msg('请输入邀请码');
-			// 	return;
-			// }
+			if ((obj.invitation == '')) {
+				obj.$api.msg('请输入邀请码');
+				return;
+			}
 			if (obj.code == '') {
 				obj.$api.msg('请输入验证码');
 				return;

pages/set/phone.vue

@@ -85,16 +85,24 @@ export default {
 			obj.loding = true;
 			binding({
 				phone: obj.account,
-				captcha: obj.captcha
+				captcha: obj.captcha,
 			})
-				.then(({ data }) => {
-					obj.$api.msg('绑定成功！');
-					setTimeout(function() {
-						obj.loding = false;
-						uni.switchTab({
-							url: '/pages/user/user'
+				.then((e) => {
+					if(e.msg=='H5已有账号是否绑定此账号上'){
+						uni.showModal({
+							title: '错误',
+							content: '该手机号已经创建过账号无法绑定,请更换手机重新绑定',
+							showCancel: false,
 						});
-					}, 1000);
+					}else{
+						obj.$api.msg('绑定成功！');
+						setTimeout(function() {
+							obj.loding = false;
+							uni.switchTab({
+								url: '/pages/user/user'
+							});
+						}, 1000);
+					}
 				})
 				.catch(err => {
 					obj.loding = false;

pages/set/set.vue

@@ -3,22 +3,22 @@
 		<uni-list>
 		    <uni-list-item title="个人资料" @click="navTo('/pages/set/userinfo')" ></uni-list-item>
 			<uni-list-item title="修改密码" @click="navTo('/pages/set/password')" ></uni-list-item>
-		    <!-- <uni-list-item title="实名认证" @click="navTo('/pages/set/phone')" ></uni-list-item> -->
+		    <uni-list-item title="绑定手机号" @click="navTo('/pages/set/phone')" ></uni-list-item>
 		    <uni-list-item title="收货地址" @click="navTo('/pages/set/address')" ></uni-list-item>
 		</uni-list>
-		<!-- <uni-list class="margin-t-20">
+		<uni-list class="margin-t-20">
 		    <uni-list-item title="消息推送" :switch-checked='true' :show-switch="true" :show-arrow="false" switch-color='#5dbc7c'  @switchChange='switchChange'> 
 			</uni-list-item>
-		</uni-list> -->
+		</uni-list>
 		
-		<!-- <uni-list class="margin-t-20">
+		<uni-list class="margin-t-20">
 		    <uni-list-item title="清除缓存" ></uni-list-item>
 		    <uni-list-item title="检查更新" >
 				<template slot="right">
 					当前版本 1.0.3
 				</template>
 			</uni-list-item>
-		</uni-list> -->
+		</uni-list>
 		<view class="list-cell log-out-btn" @click="toLogout">
 			<text class="cell-tit">退出登录</text>
 		</view>

pages/user/award.vue

@@ -5,7 +5,7 @@
 				<view class="text">可提现佣金（元）</view>
 				<view class="money">{{ yongMoney | getMoneyStyle }}</view>		
 			</view>
-			<view class="moneyTx" @click="navto('./withdrawal')">提现</view>
+			<view class="moneyTx" @click="navto('/pages/money/withdrawal')">提现</view>
 			<view class="moneyTx two" @click="navto('/pages/money/recharge?type=1')">
 				佣金转余额
 			</view>

pages/user/user.vue

@@ -11,7 +11,8 @@
 						</view>
 						<view class="info-box">
 							<view class="username">{{ userInfo.nickname || '游客' }}</view>
-							<view class="font-size-sm" v-if="userInfo.uid">UID: {{ userInfo.uid }}</view>
+							<view class="font-size-sm" v-if="userInfo.spread_uid">邀请码:{{ userInfo.spread_uid }}</view>
+							<view class="font-size-sm" v-if="userInfo.uid">用户编号:{{ userInfo.uid }}</view>
 							<text class="font-size-sm" v-if="orderTime!=''">分红周期：{{orderTime}}</text>
 						</view>
 					</view>
@@ -127,7 +128,7 @@
 							</view>
 							<text>奖励明细</text>
 						</view>
-						<view class="order-item" @click="navTo('/pages/user/scoreAccumulate')" hover-class="common-hover"
+						<view class="order-item" @click="navTo('/pages/user/award')" hover-class="common-hover"
 							:hover-stay-time="50">
 							<view class="icon">
 								<image class="icon-img" src="/static/icon/u3.png" mode="aspectFit"></image>
@@ -174,6 +175,11 @@
 				</view>
 			</view>
 		</scroll-view>
+		<view class="u-tabbar">
+			<text>临海市宗斌副食品商行</text>
+			<text>版权所有</text>
+			
+		</view>
 	</view>
 </template>
 <script>
@@ -267,8 +273,21 @@
 						data
 					}) => {
 						console.log(this.userInfo, "dasdas");
+						
 						this.setUserInfo(data);
 						console.log(data, '111111');
+						if(data.phone==null|| !data.phone){
+							uni.showModal({
+							    title: '提示',
+							    showCancel:false,
+								content:'请绑定手机号',
+								success() {
+									uni.navigateTo({
+										url:'/pages/set/phone'
+									})
+								}
+							});
+						}
 						obj.orderTime = getTime(data.cycle_time)
 						if (obj.orderTime == '') {
 							return
@@ -638,4 +657,19 @@
 			}
 		}
 	}
+	.u-tabbar{
+		margin-top: 30rpx;
+		display: flex;
+		flex-direction: column;align-items: center;
+		width: 750rpx;
+		height: 200rpx;
+		position: relative;
+		bottom: 0;
+		text{
+			font-size: 26rpx;
+			color: #DCDFE6;
+			
+		}
+	
+	}
 </style>