积分商品展示的部分问题
parent
a9db24d1ad
commit
436dd56e54
|
@ -4,24 +4,26 @@
|
||||||
*/
|
*/
|
||||||
// 开发环境
|
// 开发环境
|
||||||
const dev = {
|
const dev = {
|
||||||
common: "https://common-api.pickmall.cn",
|
common: "https://common-api.pickmall.cn",
|
||||||
buyer: "https://buyer-api.pickmall.cn",
|
buyer: "https://buyer-api.pickmall.cn",
|
||||||
|
// common: "http://192.168.0.101:8890",
|
||||||
|
// buyer: "http://192.168.0.101:8888",
|
||||||
|
// seller: "http://192.168.0.101:8889",
|
||||||
|
// manager: "http://192.168.0.101:8887",
|
||||||
};
|
};
|
||||||
// 生产环境
|
// 生产环境
|
||||||
const prod = {
|
const prod = {
|
||||||
common: "https://common-api.pickmall.cn",
|
common: "https://common-api.pickmall.cn",
|
||||||
buyer: "https://buyer-api.pickmall.cn",
|
buyer: "https://buyer-api.pickmall.cn",
|
||||||
};
|
};
|
||||||
|
|
||||||
//默认生产环境
|
//默认生产环境
|
||||||
let api = dev;
|
let api = dev;
|
||||||
//如果是开发环境
|
//如果是开发环境
|
||||||
if (process.env.NODE_ENV == "development") {
|
if (process.env.NODE_ENV == "development") {
|
||||||
api = dev;
|
api = dev;
|
||||||
} else {
|
} else {
|
||||||
api = prod;
|
api = prod;
|
||||||
}
|
}
|
||||||
//微信小程序,app的打包方式建议为生产环境,所以这块直接条件编译赋值
|
//微信小程序,app的打包方式建议为生产环境,所以这块直接条件编译赋值
|
||||||
// #ifdef MP-WEIXIN || APP-PLUS
|
// #ifdef MP-WEIXIN || APP-PLUS
|
||||||
|
@ -31,5 +33,5 @@ api = prod;
|
||||||
api.buyer += "/buyer";
|
api.buyer += "/buyer";
|
||||||
api.common += "/common";
|
api.common += "/common";
|
||||||
export default {
|
export default {
|
||||||
...api,
|
...api,
|
||||||
};
|
};
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
"name" : "lili商城",
|
"name" : "lili商城",
|
||||||
"appid" : "__UNI__C100675",
|
"appid" : "__UNI__C100675",
|
||||||
"description" : "",
|
"description" : "",
|
||||||
"versionName" : "4.0.24",
|
"versionName" : "4.0.25",
|
||||||
"versionCode" : 4000024,
|
"versionCode" : 4000025,
|
||||||
"transformPx" : false,
|
"transformPx" : false,
|
||||||
"app-plus" : {
|
"app-plus" : {
|
||||||
"compatible" : {
|
"compatible" : {
|
||||||
|
|
|
@ -151,6 +151,7 @@
|
||||||
parms.clientType = this.paymentType;
|
parms.clientType = this.paymentType;
|
||||||
|
|
||||||
API_Trade.getCashierData(parms).then((res) => {
|
API_Trade.getCashierData(parms).then((res) => {
|
||||||
|
if(res.data.success){
|
||||||
this.cashierParams = res.data.result;
|
this.cashierParams = res.data.result;
|
||||||
|
|
||||||
// #ifdef MP-WEIXIN
|
// #ifdef MP-WEIXIN
|
||||||
|
@ -187,6 +188,15 @@
|
||||||
this.walletValue = res.data.result.walletValue;
|
this.walletValue = res.data.result.walletValue;
|
||||||
this.autoCancel =
|
this.autoCancel =
|
||||||
(res.data.result.autoCancel - new Date().getTime()) / 1000;
|
(res.data.result.autoCancel - new Date().getTime()) / 1000;
|
||||||
|
}
|
||||||
|
else if(res.data.code == 32000){
|
||||||
|
setTimeout(()=>{
|
||||||
|
uni.redirectTo({
|
||||||
|
url: `/pages/order/myOrder?status=0`
|
||||||
|
});
|
||||||
|
},500)
|
||||||
|
|
||||||
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
<view>{{ item.content }}</view>
|
<view>{{ item.content }}</view>
|
||||||
<view>{{ item.createTime}}</view>
|
<view>{{ item.createTime}}</view>
|
||||||
</view>
|
</view>
|
||||||
<view><span>{{item.pointType == "1" ? '+' : '-'}}</span>{{ item.variablePoint }}</view>
|
<view><span>{{item.pointType == "INCREASE" ? '+' : '-'}}</span>{{ item.variablePoint }}</view>
|
||||||
</view>
|
</view>
|
||||||
<uni-load-more :status="count.loadStatus"></uni-load-more>
|
<uni-load-more :status="count.loadStatus"></uni-load-more>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -219,6 +219,7 @@ export default {
|
||||||
if (status == 0) {
|
if (status == 0) {
|
||||||
this.loadData(status);
|
this.loadData(status);
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
||||||
watch: {
|
watch: {
|
||||||
|
|
|
@ -96,8 +96,21 @@ export default {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
async mounted() {
|
async onShow() {
|
||||||
//获取顶级分类
|
//获取顶级分类
|
||||||
|
this.categoryIndexData = [
|
||||||
|
{
|
||||||
|
categoryId: 0,
|
||||||
|
name: "全部",
|
||||||
|
loadStatus: "more",
|
||||||
|
goods: [],
|
||||||
|
params: {
|
||||||
|
pageNumber: 1,
|
||||||
|
pageSize: 10,
|
||||||
|
pointsGoodsCategoryId: "",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
let response = await getPointsCategory();
|
let response = await getPointsCategory();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue