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

更新

This commit is contained in:
weipengfei 2024-01-15 10:00:23 +08:00
parent 7ef3039428
commit ffc8b8faf4
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifest.json
View File

@ -2,8 +2,8 @@
"name" : "惠农商户平台", "name" : "惠农商户平台",
"appid" : "__UNI__1EE148C", "appid" : "__UNI__1EE148C",
"description" : "", "description" : "",
"versionName" : "1.0.6", "versionName" : "1.0.7",
"versionCode" : 106, "versionCode" : 107,
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus" : {

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

@ -724,12 +724,12 @@
}) })
} }
if(type==4){ // 个人商户 if(type==4){ // 个人商户
// navigateTo(1, '/pages/product/addGood/addGood_one', { navigateTo(1, '/pages/product/addGood/addGood_one', {
// mer_id: this.mer_id
// });
navigateTo(1, '/pages/product/addGood/addGood', {
mer_id: this.mer_id mer_id: this.mer_id
}); });
// navigateTo(1, '/pages/product/addGood/addGood', {
// mer_id: this.mer_id
// });
} else { } else {
navigateTo(1, '/pages/product/addGood/addGood', { navigateTo(1, '/pages/product/addGood/addGood', {
mer_id: this.mer_id mer_id: this.mer_id

5
pages/product/goodsOnSale/index.vue
View File

@ -61,7 +61,10 @@
<view v-if="item.is_show == 0 && item.status == 1 && type != 5" class="shop_button" @click="upperShelfAndLowerShelf(item, index)">上架</view> <view v-if="item.is_show == 0 && item.status == 1 && type != 5" class="shop_button" @click="upperShelfAndLowerShelf(item, index)">上架</view>
<view class="shop_button" v-if="type != 1 && type != 3" @click="handleDelete(item, index)">删除</view> <view class="shop_button" v-if="type != 1 && type != 3" @click="handleDelete(item, index)">删除</view>
<view class="shop_button" v-if="type == 5" @click="reduction(item, index)">恢复</view> <view class="shop_button" v-if="type == 5" @click="reduction(item, index)">恢复</view>
<navigator :url="`/pages/product/addGood/addGood?mer_id=${merId}&product_id=${item.product_id}`" v-if="type != 5" class="shop_button" hover-class="none">编辑</navigator> <block v-if="type != 5">
<navigator v-if="mer_info.type_code=='PersonalStore'" :url="`/pages/product/addGood/addGood_one?mer_id=${merId}&product_id=${item.product_id}`" class="shop_button" hover-class="none">编辑</navigator>
<navigator v-else :url="`/pages/product/addGood/addGood?mer_id=${merId}&product_id=${item.product_id}`" class="shop_button" hover-class="none">编辑</navigator>
</block>
</view> </view>
</view> </view>
</view> </view>

9
pages/product/list/index.vue
View File

@ -711,10 +711,11 @@
// removeStorage(item); // removeStorage(item);
// } // }
// }); // });
navigateTo(1, '/pages/product/addGood/addGood', { let url = this.mer_info.type_code=='PersonalStore' ? '/pages/product/addGood/addGood_one' : '/pages/product/addGood/addGood';
mer_id: item.mer_id, navigateTo(1, url, {
product_id: item.product_id mer_id: item.mer_id,
}); product_id: item.product_id
});
}, },
handleRecycle(item, index) { handleRecycle(item, index) {
let that = this; let that = this;