12223456

manifest.json

@@ -2,14 +2,14 @@
     "name" : "易趣GO",
     "appid" : "__UNI__0D9C79D",
     "description" : "",
-    "versionName" : "1.1.3",
-    "versionCode" : 113,
+    "versionName" : "1.1.7",
+    "versionCode" : 117,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */
         "usingComponents" : true,
         "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
+            "alwaysShowBeforeRender" : false,
             "waiting" : true,
             "autoclose" : true,
             "delay" : 0
@@ -41,7 +41,8 @@
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
             },
             "ios" : {
-                "idfa" : false
+                "idfa" : false,
+                "dSYMs" : false
             },
             /* ios打包配置 */
             "sdkConfigs" : {
@@ -92,9 +93,9 @@
                 "useOriginalMsgbox" : false,
                 "iosStyle" : "common",
                 "android" : {
-                    "hdpi" : "C:/Users/Administrator/Desktop/新建文件夹 (7)/480.png",
-                    "xhdpi" : "C:/Users/Administrator/Desktop/新建文件夹 (7)/720.png",
-                    "xxhdpi" : "C:/Users/Administrator/Desktop/新建文件夹 (7)/1080.png"
+                    "hdpi" : "unpackage/key/启动图/7a48b7fdfd6661d299e657e43b5ec5c.png",
+                    "xhdpi" : "unpackage/key/启动图/191f774c4489457e5c902d7c6e77ce5.png",
+                    "xxhdpi" : "unpackage/key/启动图/0c38a9b68ca3316793544a20bb87bf8.png"
                 },
                 "ios" : {
                     "iphone" : {

pages/money/moneyPwd.vue

@@ -1,8 +1,15 @@
 <template>
 	<view class="container">
-		<view class="row b-b" v-if="type == 2">
-			<text class="tit">原密码</text>
-			<input class="input" v-model="oldPassword" type="text" placeholder="请填写原密码" placeholder-class="placeholder" />
+		<view class="row b-b">
+			<text class="tit">手机号</text>
+			<input class="input" v-model="account" type="text" placeholder="请填写手机号" placeholder-class="placeholder" />
+		</view>
+		<view>
+			<view class="row b-b">
+				<text class="tit">验证码</text>
+				<input class="input" v-model="captcha" type="text" placeholder="请填写验证码" placeholder-class="placeholder" />
+				<view class="code" @click="verification">{{ countDown == 0 ? '验证码' : countDown }}</view>
+			</view>
 		</view>
 		<view class="row b-b">
 			<text class="tit">新密码</text>
@@ -24,7 +31,9 @@ export default {
 	data() {
 		return {
 			type: 1,
-			oldPassword: '', //老密码
+			account: '', //手机号
+			captcha: '', //验证码
+			countDown: 0, //倒计时
 			password: '', //新密码
 			yzpassword: '', //重复输入
 			loding: false //是否载入中
@@ -50,6 +59,35 @@ export default {
 		}
 	},
 	methods: {
+		verification() {
+			let obj = this;
+			if (this.account == '') {
+				this.$api.msg('请输入电话号码');
+				return;
+			}
+			if (!/(^1[2|3|4|5|6|7|8|9][0-9]{9}$)/.test(this.account)) {
+				this.$api.msg('请输入正确的手机号');
+				return;
+			}
+			// 判断是否在倒计时
+			if (obj.countDown > 0) {
+				return false;
+			} else {
+				obj.countDown = 60;
+				obj.time = setInterval(() => {
+					obj.countDown--;
+				}, 1000);
+				//调用验证码接口
+				verify({
+					phone: obj.account,
+					type: 'BDING_CODE'
+				})
+					.then(({ data }) => {})
+					.catch(err => {
+						console.log(err);
+					});
+			}
+		},
 		confirm(e) {
 			const reg = /^[0-9]{6}$/;
 			console.log(this.yzpassword);
@@ -73,7 +111,8 @@ export default {
 			transaction({
 				type: this.type,
 				payment: this.password,
-				old_payment: this.oldPassword
+				phone: this.account,
+				captcha: this.captcha
 			})
 				.then(({ data }) => {
 					this.loding = false;
@@ -147,7 +186,7 @@ page {
 	background-color: $color-gray;
 }
 .code {
-	color: #5dbc7c;
+	color: #dc262b;
 	font-size: 23rpx;
 	border-left: 1px solid #eeeeee;
 	width: 150rpx;

pages/order/order.vue

@@ -289,6 +289,7 @@ export default {
 	methods: {
 		//顶部tab点击
 		tabClick(index, type) {
+			console.log('12345');
 			if (type == 0) {
 				this.tabCurrentIndex = index;
 			}
@@ -421,10 +422,10 @@ export default {
 				});
 			}
 		},
-		tiHuo(item){
+		tiHuo(item) {
 			uni.navigateTo({
-				url:'/pages/order/tihuo?id='+item.product_id
-			})
+				url: '/pages/order/tihuo?id=' + item.product_id
+			});
 		},
 		//卖家确认订单
 		orderPay(e) {
@@ -472,6 +473,7 @@ export default {
 		},
 		//获取订单列表
 		loadData(source) {
+			console.log('进入');
 			//这里是将订单挂载到tab列表下
 			let index, navItem;
 			if (this.currentIndex == 0) {
@@ -589,6 +591,7 @@ export default {
 		},
 		//swiper 切换
 		changeTab(e) {
+			console.log('切换');
 			if (this.currentIndex == 0) {
 				this.tabCurrentIndex = e.target.current;
 			}

pages/product/list.vue

@@ -61,7 +61,7 @@ export default {
 			loadingType: 'more', //加载更多状态
 			filterIndex: 0, //查询类型
 			numberOrder: 0, //1 销量从低到高 2销量从高到低
-			limit: 6, //每次加载数据条数
+			limit: 14, //每次加载数据条数
 			page: 1, //当前页数
 			cateId: 0, //已选三级分类id
 			priceOrder: 0, //1 价格从低到高 2价格从高到低

pages/set/phone.vue

@@ -57,7 +57,7 @@ export default {
 				this.$api.msg('请输入电话号码');
 				return;
 			}
-			if (!/(^1[3|4|5|7|8][0-9]{9}$)/.test(this.account)) {
+			if (!/(^1[2|3|4|5|6|7|8|9][0-9]{9}$)/.test(this.account)) {
 				this.$api.msg('请输入正确的手机号');
 				return;
 			}
@@ -89,7 +89,7 @@ export default {
 			})
 				.then(({ data }) => {
 					obj.$api.msg('绑定成功！');
-					console.log("绑定成功");
+					console.log('绑定成功');
 					setTimeout(function() {
 						obj.loding = false;
 						uni.switchTab({
@@ -99,7 +99,7 @@ export default {
 				})
 				.catch(err => {
 					obj.loding = false;
-					console.log(err,"err");
+					console.log(err, 'err');
 				});
 		}
 	}

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/0a8db870-08b5-11ed-b2df-4345eb7739fa
+https://ide.dcloud.net.cn/build/download/cb14eea0-566c-11ed-951b-655c8f9e2adb

unpackage/cache/certdata

@@ -1,3 +1,3 @@
-andrCertfile=D:/yqg.keystore
+andrCertfile=D:/工作/项目2/岚易趣go/qygg/unpackage/key/Android/yqg.keystore
 andrCertAlias=com.yqg.cn
 andrCertPass=7IwuiYJfyRjKKTfhI7sjzw==

unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>嗨易趣G0</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.2772579d.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.46b2cbf8.js></script><script src=/index/static/js/index.6942ac21.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.b0707a6a.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.da2bad7f.js></script><script src=/index/static/js/index.ff18c201.js></script></body></html>