Browse Source

修改提交订单无法修改收货地址的问题;修改无法进入砍价商品详情页面的问题;修改退出登录无法回到首页的问题;

master
gaoxs 5 years ago
parent
commit
988bdb0677
  1. 2
      assets/css/style.css
  2. 2
      assets/css/style.css.map
  3. 5
      assets/css/style.less
  4. 4
      manifest.json
  5. 6
      pages/activity/DargainDetails/index.vue
  6. 2
      pages/order/OrderSubmission/index.vue
  7. 54
      pages/user/PersonalData/index.vue
  8. 4
      utils/request.js

2
assets/css/style.css

File diff suppressed because one or more lines are too long

2
assets/css/style.css.map

File diff suppressed because one or more lines are too long

5
assets/css/style.less

@ -3667,6 +3667,11 @@ page {
height: 100%;
border-radius: 50%;
}
.personal-data .wrapper .wrapList .item .picTxt .pictrue img {
width: 100%;
height: 100%;
border-radius: 50%;
}
.personal-data .wrapper .wrapList .item .picTxt .pictrue .alter {
width: 0.3*100rpx;

4
manifest.json

@ -74,9 +74,7 @@
"UniversalLinks" : "https://yixiang.co/app/"
}
},
"ad" : {
"csj" : {}
}
"ad" : {}
},
"splashscreen" : {
"ios" : {

6
pages/activity/DargainDetails/index.vue

@ -369,7 +369,7 @@ export default {
var that = this;
getBargainDetail(that.bargainId)
.then(res => {
res.data.bargain = res.data.bargain.replace(
res.data.bargain.description = res.data.bargain.description.replace(
/\<img/gi,
'<img style="max-width:100%;height:auto;"'
);
@ -504,7 +504,9 @@ export default {
bargainId: that.bargainId,
bargainUserUid: that.bargainPartake
})
.then(() => {})
.then(() => {
})
.catch(() => {
this.$yrouter.push({
path: "/pages/activity/DargainDetails/index",

2
pages/order/OrderSubmission/index.vue

@ -486,7 +486,7 @@ export default {
},
changeAddress(addressInfo) {
this.addressInfo = addressInfo;
this.getCartInfo()
this.computedPrice();
},
createOrder() {
let shipping_type = this.shipping_type;

54
pages/user/PersonalData/index.vue

@ -55,7 +55,7 @@
<view
class="logOut cart-color acea-row row-center-wrapper"
@click="logout"
v-if="$deviceType=='app'"
v-if="$deviceType!='routine'"
>退出登录</view>
</view>
</template>
@ -67,7 +67,7 @@ import {
postUserEdit,
getLogout,
switchH5Login,
getUserInfo
getUserInfo,
} from "@/api/user";
import cookie from "@/utils/store/cookie";
import store from "@//store";
@ -78,17 +78,17 @@ export default {
components: {
// VueCoreImageUpload
},
data: function() {
data: function () {
return {
avatar: "",
isWeixin: false,
currentAccounts: 0,
switchUserInfo: [],
userIndex: 0
userIndex: 0,
};
},
computed: mapGetters(["userInfo"]),
mounted: function() {
mounted: function () {
this.avatar = this.userInfo.avatar;
this.isWeixin = isWeixin();
this.getUserInfo();
@ -97,7 +97,7 @@ export default {
goChangePassword() {
this.$yrouter.push("/pages/user/ChangePassword/index");
},
switchAccounts: function(index) {
switchAccounts: function (index) {
let that = this;
this.userIndex = index;
let userInfo = this.switchUserInfo[this.userIndex];
@ -106,7 +106,7 @@ export default {
uni.showToast({
title: "切换的账号不存在",
icon: "none",
duration: 2000
duration: 2000,
});
return;
}
@ -119,13 +119,13 @@ export default {
that.$emit("changeswitch", false);
location.reload();
})
.catch(err => {
.catch((err) => {
uni.hideLoading();
uni.showToast({
title:
err.msg || err.response.data.msg || err.response.data.message,
icon: "none",
duration: 2000
duration: 2000,
});
});
} else {
@ -135,9 +135,9 @@ export default {
this.$emit("changeswitch", false);
}
},
getUserInfo: function() {
getUserInfo: function () {
let that = this;
getUserInfo().then(res => {
getUserInfo().then((res) => {
// let switchUserInfo = res.data.switchUserInfo;
// for (let i = 0; i < switchUserInfo.length; i++) {
// if (switchUserInfo[i].uid == that.userInfo.uid) that.userIndex = i;
@ -152,58 +152,58 @@ export default {
});
},
chooseImage() {
chooseImage(img => {
console.log(img)
chooseImage((img) => {
console.log(img);
this.avatar = img;
});
},
submit: function() {
submit: function () {
let userInfo = this.userInfo;
postUserEdit({
nickname: trim(this.userInfo.nickname),
avatar: this.avatar
avatar: this.avatar,
}).then(
res => {
(res) => {
this.$store.dispatch("userInfo", true);
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000
duration: 2000,
});
this.$yrouter.back();
},
err => {
(err) => {
uni.showToast({
title:
err.msg || err.response.data.msg || err.response.data.message,
icon: "none",
duration: 2000
duration: 2000,
});
}
);
},
logout: function() {
logout: function () {
uni.showModal({
title: "提示",
content: "确认退出登录?",
success: function(res) {
success: (res) => {
if (res.confirm) {
getLogout()
.then(res => {
.then((res) => {
this.$store.commit("logout");
this.$yrouter.replace({
path: "/pages/user/Login/index",
query: {}
query: {},
});
})
.catch(err => {});
.catch((err) => {});
} else if (res.cancel) {
// console.log("");
}
}
},
});
}
}
},
},
};
</script>

4
utils/request.js

@ -61,10 +61,6 @@ function baseRequest(options) {
return fly.request(url, params || data, {
...option
}).then(res => {
console.log("——————————— "+url+" —————————————")
console.log(params || data)
console.log(res.data)
console.log("—————————————— end ——————————")
const data = res.data || {};
if (res.status !== 200) {
return Promise.reject({ msg: "请求失败", res, data });

Loading…
Cancel
Save