mkm/new_shop_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
DESKTOP-GMUNQ1B\k 2024-03-26 12:00:35 +08:00
parent dc20a1c4b1
commit 1e30a8d313
4 changed files with 73 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pages/payment/get_payment.vue
View File

@ -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;

1
pages/users/user_info/index.vue
View File

@ -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">

91
pages/users/user_modify_pwd/index.vue
View File

@ -8,33 +8,33 @@
<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"
v-model="captcha"></input>
<input type='number' maxlength="4" placeholder='验证码' placeholder-class='placeholder'
class="codeIput" v-model="captcha"></input>
<button class="code" :class="disabled === true ? 'on' : ''" :disabled='disabled'
@click="handleVerify">
{{ text }}
</button>
</view>
<view class="border"></view>
<block v-if="type == 'payPwd'">
<view class="item" @click="showPopup(1)">
<input style="pointer-events: none;" type='password' placeholder="请设置支付密码"
placeholder-class='placeholder' v-model="password" autocomplete="off"></input>
</view>
<view class="item" @click="showPopup(2)">
<input style="pointer-events: none;" type='password' placeholder="请再次设置支付密码"
placeholder-class='placeholder' v-model="repassword" autocomplete="off"></input>
</view>
</block>
<block v-if="type == 'payPwd'">
<view class="item" @click="showPopup(1)">
<input style="pointer-events: none;" type='password' placeholder="请设置支付密码"
placeholder-class='placeholder' v-model="password" autocomplete="off"></input>
</view>
<view class="item" @click="showPopup(2)">
<input style="pointer-events: none;" type='password' placeholder="请再次设置支付密码"
placeholder-class='placeholder' v-model="repassword" autocomplete="off"></input>
</view>
</block>
<block v-else>
<view class="item">
<input type='password' placeholder="请设置密码"
placeholder-class='placeholder' v-model="password" autocomplete="off"></input>
</view>
<view class="item">
<input type='password' placeholder="请再次设置密码"
placeholder-class='placeholder' v-model="repassword" autocomplete="off"></input>
</view>
<view class="item">
<input type='password' placeholder="请设置密码" placeholder-class='placeholder'
v-model="password" autocomplete="off"></input>
</view>
<view class="item">
<input type='password' placeholder="请再次设置密码" placeholder-class='placeholder'
v-model="repassword" autocomplete="off"></input>
</view>
</block>
</view>
</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>
@ -77,12 +78,12 @@
toLogin
} from '@/libs/login.js';
import Verify from '@/components/verify/verify.vue';
import popups from "@/components/popups/index.vue";
import popups from "@/components/popups/index.vue";
export default {
mixins: [sendVerifyCode],
components: {
Verify,
popups
popups
},
data() {
return {
@ -95,7 +96,7 @@
codeVal: '',
disabled: false,
type: '',
set_type: '',
set_type: '',
};
},
computed: mapGetters(['isLogin', 'viewColor']),
@ -129,18 +130,18 @@
that.userInfo = res.data
});
},
showPopup(type){
this.set_type = type;
this.$refs.popups.handleOpen();
},
// 输入密码回调
handleConfirm(e) {
if(this.set_type==1)this.password = e;
else this.repassword = e;
},
handleClear() {},
handleChange() {},
showPopup(type) {
this.set_type = type;
this.$refs.popups.handleOpen();
},
// 输入密码回调
handleConfirm(e) {
if (this.set_type == 1) this.password = e;
else this.repassword = e;
},
handleClear() {},
handleChange() {},
confirmSubmit: function() {
let that = this;
@ -164,12 +165,16 @@
sms_code: that.captcha
}).then(res => {
that.$util.Tips({
title: '修改成功！',
icon: 'success'
})
this.$nextTick((res=>{
uni.navigateBack();
}))
title: '修改成功！',
icon: 'success'
}, () => {
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 => {

28
pages/users/user_nickname/index.vue
View File

@ -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"
v-model="inputcontent"></input>
<input type='text' placeholder='新昵称(限8个字符以内)' maxlength="8" placeholder-class='placeholder'
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 { mapGetters } from "vuex";
import { toLogin } from '@/libs/login.js';
import {
getUserInfo,
userEdit,
editAvatar
} from '@/api/user.js'
import {
mapGetters
} from "vuex";
import {
toLogin
} from '@/libs/login.js';
export default {
components: {},
data() {
@ -61,7 +69,7 @@
if (this.userInfo.nickname == this.inputcontent) {
uni.showToast({
title: '昵称重复，请重新修改！',
icon:'none',
icon: 'none',
});
} else if (this.inputcontent == '') {
uni.showToast({
@ -83,7 +91,7 @@
uni.showToast({
title: err,
icon: 'none'
});
});
});
}
},
@ -156,6 +164,10 @@
background-color: var(--view-theme);
}
.ChangePassword .confirmBnt:active {
opacity: .8;
}
.getPhoneBtn {
font-size: 32rpx;
width: 580rpx;
@ -172,4 +184,4 @@
margin-right: 12rpx;
}
}
</style>
</style>