diff --git a/assets/css/style.less b/assets/css/style.less
index d002810..9a360f4 100644
--- a/assets/css/style.less
+++ b/assets/css/style.less
@@ -6313,7 +6313,7 @@ page {
margin: 0.25*100rpx auto 0 auto;
padding: 0.53*100rpx 0 0.58*100rpx 0;
left: 50%;
- margin-left: -3.55*100rpx;
+ //margin-left: -3.55*100rpx;
}
.cash-audit .pictrue {
diff --git a/components/CitySelect.vue b/components/CitySelect.vue
index ba20f4f..d8d8add 100644
--- a/components/CitySelect.vue
+++ b/components/CitySelect.vue
@@ -195,7 +195,6 @@ export default {
background-color: #fff;
z-index: 1502;
position: relative;
- height: 800rpx;
padding-bottom: 0;
padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom);
@@ -203,7 +202,7 @@ export default {
height: 100%;
}
.swiper {
- height: 100%;
+ height: 800rpx;
}
}
.cityselect-header {
diff --git a/components/OrderGoods.vue b/components/OrderGoods.vue
index 338a1c9..18682ca 100644
--- a/components/OrderGoods.vue
+++ b/components/OrderGoods.vue
@@ -16,7 +16,7 @@
v-if="cart.productInfo.attrInfo"
>{{ cart.productInfo.attrInfo.sku }}
¥{{ cart.truePrice }}
- 评价
+ 评价
diff --git a/config/index.js b/config/index.js
index 47f84b0..d2956c4 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,7 +1,7 @@
// export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
-export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api';
+//export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api';
// export const VUE_APP_API_URL = 'http://192.168.31.223:8008/api';
-// export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
+ export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
// export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
export const VUE_APP_RESOURCES_URL = 'https://wx.yixiang.co/static';
diff --git a/manifest.json b/manifest.json
index 43136fe..f3b15fa 100644
--- a/manifest.json
+++ b/manifest.json
@@ -92,7 +92,8 @@
"hdpi" : "unpackage/res/splash/480+762.png",
"xhdpi" : "unpackage/res/splash/720+1242.png",
"xxhdpi" : "unpackage/res/splash/1080+1882.png"
- }
+ },
+ "iosStyle" : "common"
},
"icons" : {
"android" : {
diff --git a/pages/activity/DargainDetails/index.vue b/pages/activity/DargainDetails/index.vue
index e574c50..a361e4b 100644
--- a/pages/activity/DargainDetails/index.vue
+++ b/pages/activity/DargainDetails/index.vue
@@ -55,8 +55,8 @@
- 砍价成功
-
+ 砍价成功
+
@@ -267,15 +267,18 @@
// 查看商品
openAlone: function () {
this.$yrouter.push({
- path: "/detail/" + this.bargain.productId
+ path: "/pages/shop/GoodsCon/index",
+ query: {
+ id: this.goodsDetail.productId
+ }
});
},
// 砍价完成,去支付
goPay: function () {
var data = {};
var that = this;
- data.productId = that.bargain.productId;
- data.cartNum = that.bargain.num;
+ data.productId = that.goodsDetail.productId;
+ data.cartNum = that.goodsDetail.num;
data.uniqueId = "";
data.bargainId = that.bargainId;
data.new = 1;
@@ -379,7 +382,7 @@
getBargainHelp: function () {
var that = this;
if (
- this.bargainHelpCount.remainingPrice === 0 &&
+ this.bargainHelpCount.price === 0 &&
that.bargainUid !== that.userInfo.uid
) {
return uni.showToast({
@@ -478,7 +481,7 @@
bargainUserUid: this.bargainUid
})
.then(res => {
- // 剩余砍价金额 = 商品价格 - 已经砍掉的金额
+ // 剩余砍价金额,显示已砍至¥** 使用 = 商品价格 - 已经砍掉的金额
let remainingPrice = (this.goodsDetail.price - res.data.alreadyPrice).toFixed(2)
this.bargainHelpCount = {
...res.data,
@@ -514,7 +517,7 @@
if (
this.bargainUid === this.userInfo.uid &&
this.bargainHelpCount.status == 1 &&
- this.bargainHelpCount.remainingPrice > 0
+ this.bargainHelpCount.price > 0
) {
this.inviteFriends = true
} else {
@@ -526,7 +529,7 @@
this.bargainUid != this.userInfo.uid &&
this.bargainHelpCount.status == 1 &&
// this.bargainHelpCount.userBargainStatus &&
- this.bargainHelpCount.remainingPrice > 0
+ this.bargainHelpCount.price > 0
) {
this.helpFriendsBargain = true
} else {
@@ -537,7 +540,7 @@
if (
this.bargainUid === this.userInfo.uid &&
this.bargainHelpCount.status == 1 &&
- this.bargainHelpCount.remainingPrice <= 0
+ this.bargainHelpCount.price <= 0
) {
this.pay = true
} else {
diff --git a/pages/activity/SeckillDetails/index.vue b/pages/activity/SeckillDetails/index.vue
index cc45195..f339365 100644
--- a/pages/activity/SeckillDetails/index.vue
+++ b/pages/activity/SeckillDetails/index.vue
@@ -10,8 +10,8 @@
距秒杀结束仅剩
-
+
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 0d94ee2..06fe5d1 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -214,7 +214,7 @@
},
},
- onShow: function() {
+ onLoad: function() {
this.getLocation()
let that = this;
uni.showLoading({
@@ -451,7 +451,7 @@
}
.nav-title {
- margin-left: 20rpx;
+ margin-left: 20rpx;
line-height: 40px;
}
-
+
diff --git a/pages/user/UserVip/index.vue b/pages/user/UserVip/index.vue
index 9498832..d5e992c 100644
--- a/pages/user/UserVip/index.vue
+++ b/pages/user/UserVip/index.vue
@@ -178,7 +178,7 @@ export default {
res => {
that.vipRequire = res.data.list;
that.vipComplete = res.data.task;
- that.taskCount = res.data.reach_count;
+ that.taskCount = res.data.reachCount;
},
err => {
uni.showToast({
diff --git a/pages/user/promotion/PromoterList/index.vue b/pages/user/promotion/PromoterList/index.vue
index a2b707f..b765ae9 100644
--- a/pages/user/promotion/PromoterList/index.vue
+++ b/pages/user/promotion/PromoterList/index.vue
@@ -13,22 +13,14 @@
- 一级({{ first||'0' }})
- 二级({{ second||'0' }})
+ 一级({{ first||'0' }})
+ 二级({{ second||'0' }})
@@ -56,11 +48,8 @@
-
+
@@ -84,166 +73,167 @@
diff --git a/unpackage/debug/.ios.ins b/unpackage/debug/.ios.ins
new file mode 100644
index 0000000..3856a44
--- /dev/null
+++ b/unpackage/debug/.ios.ins
@@ -0,0 +1 @@
+installed
\ No newline at end of file
diff --git a/unpackage/debug/iOS_debug.ipa b/unpackage/debug/iOS_debug.ipa
new file mode 100644
index 0000000..8543626
Binary files /dev/null and b/unpackage/debug/iOS_debug.ipa differ
diff --git a/utils/index.js b/utils/index.js
index f323b57..a12325a 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -240,6 +240,11 @@ export const login = () => {
reject('当前运行环境为H5')
return
}
+ if (Vue.prototype.$deviceType == 'app') {
+ console.log('当前运行环境为app')
+ reject('当前运行环境为app')
+ return
+ }
console.log('————————————————————')
console.log('开始登录')
console.log('————————————————————')
@@ -983,7 +988,7 @@ export function chooseImage(callback) {
console.log(image);
uni.showLoading({ title: "图片上传中", mask: true });
uni.uploadFile({
- url: `${VUE_APP_API_URL} /api/upload`,
+ url: `${VUE_APP_API_URL}/api/upload`,
file: image,
filePath: image.path,
header: {
diff --git a/utils/request.js b/utils/request.js
index 0732c76..1147e3f 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -41,6 +41,13 @@ fly.interceptors.response.use(
console.log('————————')
handleLoginFailure();
return Promise.reject({ msg: "未登录", toLogin: true });
+ }
+ if (error.response.data.status == 5109) {
+ uni.showToast({
+ title: error.response.data.msg,
+ icon: "none",
+ duration: 2000
+ });
}
return Promise.reject(error);
}