Browse Source

1、编辑地址默认是选择提交修改后,默认没了

2、添加新地址跳转到个人资料了????
3、个人资料修改密码去掉
4、提现 支付宝 提交问提
master
gaoxs 5 years ago
parent
commit
cd98bf7acd
  1. 36
      pages/shop/GoodsList/index.vue
  2. 4
      pages/user/PersonalData/index.vue
  3. 8
      pages/user/address/AddAddress/index.vue
  4. 51
      pages/user/promotion/UserCash/index.vue

36
pages/shop/GoodsList/index.vue

@ -147,24 +147,24 @@ export default {
!this.loading && this.get_product_list(); !this.loading && this.get_product_list();
}, },
onHide() { onHide() {
this.hostProduct = []; // this.hostProduct = [];
this.productList = []; // this.productList = [];
this.Switch = true; // this.Switch = true;
this.where = { // this.where = {
page: 1, // page: 1,
limit: 8, // limit: 8,
keyword: s, // keyword: s,
sid: id, //id // sid: id, //id
news: 0, // news: 0,
priceOrder: "", // priceOrder: "",
salesOrder: "" // salesOrder: ""
}; // };
this.loadTitle = ""; // this.loadTitle = "";
this.loading = false; // this.loading = false;
this.loadend = false; // this.loadend = false;
this.price = 0; // this.price = 0;
this.stock = 0; // this.stock = 0;
this.nows = fals; // this.nows = fals;
}, },
methods: { methods: {
goGoodsCon(item) { goGoodsCon(item) {

4
pages/user/PersonalData/index.vue

@ -76,13 +76,13 @@
<input type="text" v-else value="未绑定" disabled class="id" /> <input type="text" v-else value="未绑定" disabled class="id" />
</view> </view>
</view> </view>
<view class="item acea-row row-between-wrapper" @click="goChangePassword()"> <!-- <view class="item acea-row row-between-wrapper" @click="goChangePassword()">
<view>密码</view> <view>密码</view>
<view class="input acea-row row-between-wrapper"> <view class="input acea-row row-between-wrapper">
<text>点击修改密码</text> <text>点击修改密码</text>
<text class="iconfont icon-suozi"></text> <text class="iconfont icon-suozi"></text>
</view> </view>
</view> </view> -->
</view> </view>
<!--<view class="modifyBnt bg-color-red" @click="submit">保存修改</view>--> <!--<view class="modifyBnt bg-color-red" @click="submit">保存修改</view>-->
<!-- <view <!-- <view

8
pages/user/address/AddAddress/index.vue

@ -177,7 +177,7 @@ export default {
phone: phone, phone: phone,
address: this.address, address: this.address,
detail: detail, detail: detail,
is_default: isDefault, is_default: isDefault ? true : false,
post_code: "" post_code: ""
}; };
postAddress(data).then(function() { postAddress(data).then(function() {
@ -193,9 +193,9 @@ export default {
icon: "none", icon: "none",
duration: 2000 duration: 2000
}); });
that.$yrouter.replace({ // that.$yrouter.replace({
path: "/pages/user/PersonalData/index" // path: "/pages/user/PersonalData/index"
}); // });
} }
that.$yrouter.go(-1); that.$yrouter.go(-1);
}); });

51
pages/user/promotion/UserCash/index.vue

@ -89,6 +89,7 @@ export default {
}, },
methods: { methods: {
swichNav: function(index, item) { swichNav: function(index, item) {
console.log(item);
this.currentTab = index; this.currentTab = index;
this.post.extract_type = item.type; this.post.extract_type = item.type;
}, },
@ -103,7 +104,7 @@ export default {
function(err) { function(err) {
uni.showToast({ uni.showToast({
title: err.msg || err.response.data.msg, title: err.msg || err.response.data.msg,
icon: 'none', icon: "none",
duration: 2000 duration: 2000
}); });
} }
@ -117,31 +118,45 @@ export default {
cardnum = this.post.cardnum, cardnum = this.post.cardnum,
weixin = this.post.weixin, weixin = this.post.weixin,
that = this; that = this;
// console.log(parseFloat(money))
if ( if (
parseFloat(money) > parseFloat(that.commissionCount) || parseFloat(money) > parseFloat(that.commissionCount) ||
parseFloat(that.commissionCount) == 0 parseFloat(that.commissionCount) == 0
) { )
uni.showToast({ return that.$dialog.message("余额不足");
title: "余额不足", if (parseFloat(money) < parseFloat(that.minPrice))
icon: "none", return that.$dialog.message("最低提现金额" + that.minPrice);
duration: 2000 //console.log(that.post.extract_type)
});
return;
}
if (parseFloat(money) < parseFloat(that.minPrice)) {
uni.showToast({
title: "最低提现金额" + that.minPrice,
icon: "none",
duration: 2000
});
return;
}
switch (that.post.extract_type) { switch (that.post.extract_type) {
case "alipay": case "alipay":
// if (!name) {
// uni.showToast({
// title: "",
// icon: "none",
// duration: 2000
// });
// return;
// }
// if (!alipay_code) {
// uni.showToast({
// title: "",
// icon: "none",
// duration: 2000
// });
// return;
// }
// if (!money) {
// uni.showToast({
// title: "",
// icon: "none",
// duration: 2000
// });
// return;
// }
try { try {
await this.$validator({ await this.$validator({
name: [required(required.message("支付宝用户名"))], name: [required(required.message("支付宝用户名"))],
alipayCode: [required(required.message("支付宝账号"))], alipay_code: [required(required.message("支付宝账号"))],
money: [required(required.message("提现金额"))] money: [required(required.message("提现金额"))]
}).validate({ name, alipay_code, money }); }).validate({ name, alipay_code, money });
let save = { let save = {

Loading…
Cancel
Save