1

pages/payment/get_payment.vue

@@ -257,16 +257,6 @@
 									enabledPlatformCoupon: res1.data.enabledPlatformCoupon,
 									platformCoupon: res1.data.platformCoupon
 								})
-
-								// uni.setStorageSync('datas', {
-								// 	platformConsumption: res1.data.platformConsumption ||
-								// 	[],
-								// 	productData: that.merchantInfo,
-								// 	checkForm: that.checkForm,
-								// 	merName: that.mer_name,
-								// 	money: that.cartForm.total_amount,
-								// 	key: res1.data.key
-								// })
 							},
 							fail(err) {
 								console.log(err)
@@ -296,6 +286,11 @@
 						this.mer_name = res.data.merchant;
 					} else {
 						that.merchantInfo = res.data.list;
+						if (res.data.count == 0) {
+							that.$util.Tips({
+								title: "当前价格下,暂无商品信息~"
+							})
+						}
 					}
 				}).catch((err) => {
 					that.loading = false;

pages/users/user_info/index.vue

@@ -100,7 +100,6 @@
 						</view>
 					</view>
 
-
 					<view class='item acea-row row-between-wrapper'>
 						<view>填写邀请码</view>
 						<view class='input acea-row row-between-wrapper' @click="showPopup">

pages/users/user_modify_pwd/index.vue

@@ -8,8 +8,8 @@
 							<text class="phone">{{userInfo.phone}}</text>
 						</view>
 						<view class="item acea-row row-between-wrapper codeVal">
-							<input type='number' maxlength="4" placeholder='验证码' placeholder-class='placeholder' class="codeIput"
+							<input type='number' maxlength="4" placeholder='验证码' placeholder-class='placeholder'
-								v-model="captcha"></input>
+								class="codeIput" v-model="captcha"></input>
 							<button class="code" :class="disabled === true ? 'on' : ''" :disabled='disabled'
 								@click="handleVerify">
 								{{ text }}
@@ -28,12 +28,12 @@
 						</block>
 						<block v-else>
 							<view class="item">
-						  	<input type='password' placeholder="请设置密码"
+								<input type='password' placeholder="请设置密码" placeholder-class='placeholder'
-						  		placeholder-class='placeholder' v-model="password" autocomplete="off"></input>
+									v-model="password" autocomplete="off"></input>
 							</view>
 							<view class="item">
-						  	<input type='password' placeholder="请再次设置密码"
+								<input type='password' placeholder="请再次设置密码" placeholder-class='placeholder'
-						  		placeholder-class='placeholder' v-model="repassword" autocomplete="off"></input>
+									v-model="repassword" autocomplete="off"></input>
 							</view>
 						</block>
 					</view>
@@ -43,7 +43,8 @@
 		</form>
 		<Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }"
 			ref="verify"></Verify>
-    <popups ref="popups" isPay title="请设置支付密码" @confirm="handleConfirm" @clear="handleClear" @change="handleChange"></popups>
+		<popups ref="popups" isPay title="请设置支付密码" @confirm="handleConfirm" @clear="handleClear" @change="handleChange">
+		</popups>
 	</view>
 </template>
 
@@ -166,10 +167,14 @@
 						that.$util.Tips({
 							title: '修改成功！',
 							icon: 'success'
-            })
+						}, () => {
-            this.$nextTick((res=>{
 							uni.navigateBack();
-            }))
+						})
+					}).catch((err) => {
+						that.$util.Tips({
+							title: err,
+							icon: 'success'
+						})
 					})
 				} else { // 登录密码
 					modifyPassword({
@@ -204,7 +209,7 @@
 				await registerVerify({
 					phone: that.userInfo.phone,
 					code: that.captcha,
-					type: 'change_pwd',
+					type: this.type == 'payPwd' ? 'pay_pwd' : 'change_pwd',
 					captchaType: 'blockPuzzle',
 					captchaVerification: data.captchaVerification
 				}).then(res => {

pages/users/user_nickname/index.vue

@@ -8,8 +8,8 @@
 						<input type='text' name='nickname' :value='userInfo.nickname' disabled></input>
 					</view>
 					<view class="item acea-row row-between-wrapper">
-						<input type='text' placeholder='新昵称(限8个字符以内)' maxlength="8" placeholder-class='placeholder' class="codeIput"
+						<input type='text' placeholder='新昵称(限8个字符以内)' maxlength="8" placeholder-class='placeholder'
-							v-model="inputcontent"></input>
+							class="codeIput" v-model="inputcontent"></input>
 					</view>
 				</view>
 				<button form-type="submit" @click="inputEdita" class="confirmBnt">确认修改</button>
@@ -28,9 +28,17 @@
 	// +----------------------------------------------------------------------
 	// | Author: CRMEB Team <admin@crmeb.com>
 	// +----------------------------------------------------------------------
-	import { getUserInfo, userEdit, editAvatar } from '@/api/user.js'
+	import {
-	import { mapGetters } from "vuex";
+		getUserInfo,
-	import { toLogin } from '@/libs/login.js';
+		userEdit,
+		editAvatar
+	} from '@/api/user.js'
+	import {
+		mapGetters
+	} from "vuex";
+	import {
+		toLogin
+	} from '@/libs/login.js';
 	export default {
 		components: {},
 		data() {
@@ -156,6 +164,10 @@
 		background-color: var(--view-theme);
 	}
 
+	.ChangePassword .confirmBnt:active {
+		opacity: .8;
+	}
+
 	.getPhoneBtn {
 		font-size: 32rpx;
 		width: 580rpx;