zhuce
/
lilishop-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-uniapp

master
paulGao 2022-04-21 14:58:36 +08:00
parent b22ad88f37 f87ec18669
commit 6cd36b19b2
5 changed files with 192 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.js
View File

@ -6,7 +6,7 @@ export default {
downloadLink: "https://pickmall.cn/download-page/index.html", //下载地址，下载app的地址
shareLink: "https://m-b2b2c.pickmall.cn", //分享地址，也就是在h5中默认的复制地址
appid: "wx6f10f29075dc1b0b", //小程序唯一凭证，即 AppID，可在「微信公众平台 - 设置 - 开发设置」页中获得。（需要已经成为开发者，且帐号没有异常状态）
aMapKey: "d649892b3937a5ad20b76dacb2bcb5bd", //在高德中申请web端key
aMapKey: "d649892b3937a5ad20b76dacb2bcb5bd", //在高德中申请Web服务key
scanAuthNavigation:['https://m-b2b2c.pickmall.cn/'], //扫码认证跳转域名配置 会根据此处配置的路由进行跳转
iosAppId:"id1564638363", //AppStore的应用地址id 具体在分享->拷贝链接中查看
logo:"https://lilishop-oss.oss-cn-beijing.aliyuncs.com/4c864e133c2944efad1f7282ac8a3b9e.png", //logo地址

4
manifest.json
View File

@ -195,10 +195,6 @@
}
},
"plugins" : {
"myPlugin" : {
"version" : "1.1.0",
"provider" : "wx738958e0f4c894f9"
},
"live-player-plugin" : {
"version" : "1.3.0",
"provider" : "wx2b03c6e691cd7370"

6
pages/mine/point/myPoint.vue
View File

@ -11,11 +11,11 @@
<u-row class="portrait-box2">
<u-col span="6" class="portrait-box2-col" :gutter="16">
<text>累计获得：</text>
<text class="pcolor">{{ pointData.point || 0 }}</text>
<text class="pcolor">{{ pointData.totalPoint || 0 }}</text>
</u-col>
<u-col span="6" class="portrait-box2-col">
<text>未使用：</text>
<text class="pcolor">{{ pointData.variablePoint || 0 }}</text>
<text>剩余积分：</text>
<text class="pcolor">{{ pointData.point || 0 }}</text>
</u-col>
</u-row>

10
pages/order/myOrder.vue
View File

@ -323,7 +323,7 @@ export default {
} else {
this.initData(0);
}
this.loadData(this.status);
// this.loadData(this.status);
},
onShow() {
if (this.tabCurrentIndex) {
@ -331,7 +331,7 @@ export default {
} else {
this.initData(0);
}
this.loadData(this.status);
// this.loadData(this.status);
},
onLoad(options) {
@ -342,9 +342,9 @@ export default {
let status = Number(options.status);
this.status = status;
this.tabCurrentIndex = status;
if (status == 0) {
this.loadData(status);
}
// if (status == 0) {
// this.loadData(status);
// }
},
watch: {

20
pages/product/product/promotion/-promotion-coupon.vue
View File

@ -11,15 +11,11 @@
<view class="text">
<div class="coupon-List-title">
<view v-if="item.scopeType">
<span v-if="item.scopeType == 'ALL' && item.id == 'platform'"
>全平台</span
>
<span v-if="item.scopeType == 'ALL' && item.id == 'platform'">全平台</span>
<span v-if="item.scopeType == 'PORTION_CATEGORY'">仅限品类</span>
<view v-else
>{{
<view v-else>{{
item.storeName == "platform" ? "全平台" : item.storeName + "店铺"
}}使用</view
>
}}使用</view>
</view>
</div>
<div>满{{ item.consumeThreshold | unitPrice }}可用</div>
@ -31,7 +27,7 @@
</view>
</view>
<view class="line"></view>
<view class="time">{{ item.startTime }} - {{ item.endTime }}</view>
<view class="time">{{ item.startTime / 1000 | unixToDate }} - {{ item.endTime / 1000 | unixToDate }}</view>
</view>
</view>
</view>
@ -42,7 +38,7 @@ export default {
data() {
return {
yhqFlag: [], //获取优惠券判断是否点击
couponRes: {},
couponRes: [],
};
},
props: {
@ -58,7 +54,8 @@ export default {
Object.keys(this.res).forEach((item) => {
let key = item.split("-")[0];
if (key === "COUPON") {
this.couponRes[item] = this?.res[item];
this.couponRes.push(this?.res[item]);
}
});
}
@ -84,6 +81,7 @@ export default {
flex-direction: column;
justify-content: space-between;
}
.coupon-List {
display: flex;
flex-direction: column;
@ -140,6 +138,7 @@ export default {
height: 100%;
align-items: center;
span {
font-size: 50rpx;
}
@ -164,6 +163,7 @@ export default {
display: flex;
align-items: center;
margin-left: 40rpx;
text {
width: 140rpx;
height: 40rpx;