Browse Source

2023-12-20

cmy 1 year ago
parent
commit
ac5f5ff72a

+ 0 - 1
config/app.js

@@ -4,7 +4,6 @@ module.exports = {
 	// 请求域名 格式: https://您的域名
 	HTTP_REQUEST_URL: `https://liaoningaoxun.com`,
 	// #endif
-
 	// H5配置
 	// #ifdef H5
 	//H5接口是浏览器地址,非单独部署不用修改

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "御康堂",
     "appid" : "__UNI__A07DF11",
     "description" : "御康堂",
-    "versionName" : "5.2.2",
-    "versionCode" : 522,
+    "versionName" : "5.2.4",
+    "versionCode" : 524,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

+ 1 - 0
mixins/SendVerifyCode.js

@@ -19,6 +19,7 @@ export default {
 	},
 	methods: {
 		sendCode() {
+			console.log('sendcode');
 			if (this.disabled) return;
 			this.disabled = true;
 			let n = 60;

+ 2 - 1
pages/annex/settled/index.vue

@@ -299,7 +299,8 @@
 						captchaVerification: data.captchaVerification
 					})
 					.then(res => {
-						this.sendCode()
+						this.sendCode();
+						console.log(this.sendCode(),'this.sendCode()')
 						that.$util.Tips({
 							title: res.msg
 						});

+ 2 - 2
pages/goods/order_confirm/index.vue

@@ -85,7 +85,7 @@
 						</checkbox-group>
 					</view>
 				</view>
-				<view class='item acea-row row-between-wrapper' >
+				<!-- <view class='item acea-row row-between-wrapper' >
 					<view>{{$t(`复投积分抵扣`)}}</view>
 					<view class='discount acea-row row-middle'>
 						<view> {{useReorderIntegral ? $t(`剩余积分`):$t(`当前积分`)}}
@@ -95,7 +95,7 @@
 							<checkbox :disabled="reorder_integral<=0 && !useReorderIntegral" :checked='useReorderIntegral ? true : false' />
 						</checkbox-group>
 					</view>
-				</view>
+				</view> -->
 				<view v-if="invoice_func || special_invoice" class='item acea-row row-between-wrapper' @tap="goInvoice">
 					<view>{{$t(`开具发票`)}}</view>
 					<view class='discount'>

+ 11 - 6
pages/users/login/index.vue

@@ -415,9 +415,12 @@
 						this.getCode(data);
 					})
 					.catch(res => {
-						this.$util.Tips({
-							title: res
-						});
+						if(res!='参数错误!'){
+							this.$util.Tips({
+								title: res
+							});
+						}
+						
 					});
 			},
 			code() {
@@ -581,9 +584,11 @@
 						});
 					})
 					.catch(res => {
-						that.$util.Tips({
-							title: res
-						});
+						if(res!='参数错误!'){
+							that.$util.Tips({
+								title: res
+							});
+						}
 					});
 			},
 			navTap: function(index) {

+ 19 - 14
pages/users/login/register.vue

@@ -33,8 +33,7 @@
 				<view class="item">
 					<view class="acea-row row-middle">
 						<image src="../static/code_2.png" style="width: 28rpx; height: 32rpx;"></image>
-						<input type="text" :placeholder="$t(`填写邀请码`)" class="codeIput"
-							v-model="spread" />
+						<input type="text" :placeholder="$t(`填写邀请码`)" class="codeIput" v-model="spread" />
 					</view>
 				</view>
 				<view class="item">
@@ -130,7 +129,7 @@
 				inAnimation: false,
 				protocol: false,
 				current: 1,
-				spread:'',
+				spread: '',
 				account: "",
 				password: "",
 				captcha: "",
@@ -194,10 +193,12 @@
 				this.$refs.verify.hide()
 				getCodeApi()
 					.then(res => {
+						// console.log('get', res);
 						this.keyCode = res.data.key;
 						this.getCode(data);
 					})
 					.catch(res => {
+						console.log('res','res');
 						this.$util.Tips({
 							title: res
 						});
@@ -328,6 +329,7 @@
 						that.formItem = 1;
 					})
 					.catch(res => {
+						console.log('错误1', res);
 						that.$util.Tips({
 							title: res
 						});
@@ -348,14 +350,15 @@
 					title: that.$t(`请输入正确的手机号码`)
 				});
 				if (that.formItem == 2) that.type = "register";
-
-				await registerVerify({
-						phone: that.account,
-						type: that.type,
-						key: that.keyCode,
-						captchaType: this.captchaType,
-						captchaVerification: data.captchaVerification
-					})
+				const updata = {
+					phone: that.account,
+					type: that.type,
+					key: that.keyCode,
+					captchaType: this.captchaType,
+					captchaVerification: data.captchaVerification
+				};
+				// console.log(updata);
+				await registerVerify(updata)
 					.then(res => {
 						this.sendCode()
 						that.$util.Tips({
@@ -363,9 +366,11 @@
 						});
 					})
 					.catch(res => {
-						that.$util.Tips({
-							title: res
-						});
+						if(res!='参数错误!'){
+							that.$util.Tips({
+								title: res
+							});
+						}
 					});
 			},
 			navTap: function(index) {

+ 2 - 0
utils/request.js

@@ -79,10 +79,12 @@ function baseRequest(url, method, data, {
 						}
 					});
 				} else{
+					// console.log(res,'错误数据');
 					reject(res.data.msg || i18n.t(`系统错误`));
 				}
 			},
 			fail: (msg) => {
+				console.log(msg,'请求错误');
 				let data = {
 					mag: i18n.t(`请求失败`),
 					status: 1 //1没网