mkm
/
shop-applet
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: mkm:735e91b8b2ed545cbb74cdd8fc082a9de5a05aee
Branches Tags
mkm:main
mkm:pre-release
mkm:master
mkm:dev
mkm:feature-releaseGoods
mkm:hotfixbug
...
compare: mkm:8167f71bfdb6880e212aa0336b035639f618f7b1
Branches Tags
mkm:pre-release
mkm:master
mkm:dev
mkm:feature-releaseGoods
mkm:hotfixbug
mkm:main

4 Commits
735e91b8b2 ... 8167f71bfd

Author SHA1 Message Date
weipengfei 8167f71bfd Merge branch 'new' of https://gitea.lihaink.cn/mkm/shop-applet into new 2024-03-21 17:31:38 +08:00
weipengfei 95431d4bd6 修复bug 2024-03-21 17:26:58 +08:00
weipengfei ece51bf8d8 Merge branch 'new' of https://gitea.lihaink.cn/mkm/shop-applet into new 2024-03-21 15:26:03 +08:00
weipengfei af0d0b8ef8 更新 2024-03-21 15:25:58 +08:00
2 changed files with 9 additions and 9 deletions
Show Stats Expand all files Collapse all files

2
pages/activeCode/subsidy.vue
View File

@ -35,7 +35,7 @@
</view> </view>
<view class="b-bottom"> <view class="b-bottom">
<view class="pro"> <view class="pro">
<view class="loss"> <view class="loss" :style="{left: `-${100-info.spring_subsidy_rate}%`}">
<image class="image" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f805f20240229155704834.webp"></image> <image class="image" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f805f20240229155704834.webp"></image>
<view class="text">{{info.spring_subsidy_rate}}%</view> <view class="text">{{info.spring_subsidy_rate}}%</view>
</view> </view>

16
pages/nongKe/gather/select_warehouse.vue
View File

@ -286,14 +286,14 @@
this.mer_id = e.mer_id this.mer_id = e.mer_id
this.userInfo = this.$store.state.app.userInfo; this.userInfo = this.$store.state.app.userInfo;
if(typeof this.userInfo == 'string') this.userInfo = JSON.parse(this.userInfo); if(typeof this.userInfo == 'string') this.userInfo = JSON.parse(this.userInfo);
if(this.userInfo.mer_info.type_code=='PersonalStore'){ // if(this.userInfo.mer_info.type_code=='PersonalStore'){
this.goodsData = [{ // this.goodsData = [{
name: '农产品入库', // name: '农产品入库',
type: 4, // type: 4,
// src: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/saoma.png' // // src: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/saoma.png'
src: '/static/images/SMRK/nong.png' // src: '/static/images/SMRK/nong.png'
}] // }]
} // }
}, },
onShow() { onShow() {