This commit is contained in:
parent
7ef3039428
commit
ffc8b8faf4
|
@ -2,8 +2,8 @@
|
|||
"name" : "惠农商户平台",
|
||||
"appid" : "__UNI__1EE148C",
|
||||
"description" : "",
|
||||
"versionName" : "1.0.6",
|
||||
"versionCode" : 106,
|
||||
"versionName" : "1.0.7",
|
||||
"versionCode" : 107,
|
||||
"transformPx" : false,
|
||||
/* 5+App特有相关 */
|
||||
"app-plus" : {
|
||||
|
|
|
@ -724,12 +724,12 @@
|
|||
})
|
||||
}
|
||||
if(type==4){ // 个人商户
|
||||
// navigateTo(1, '/pages/product/addGood/addGood_one', {
|
||||
// mer_id: this.mer_id
|
||||
// });
|
||||
navigateTo(1, '/pages/product/addGood/addGood', {
|
||||
navigateTo(1, '/pages/product/addGood/addGood_one', {
|
||||
mer_id: this.mer_id
|
||||
});
|
||||
// navigateTo(1, '/pages/product/addGood/addGood', {
|
||||
// mer_id: this.mer_id
|
||||
// });
|
||||
} else {
|
||||
navigateTo(1, '/pages/product/addGood/addGood', {
|
||||
mer_id: this.mer_id
|
||||
|
|
|
@ -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 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>
|
||||
<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>
|
||||
|
|
|
@ -711,10 +711,11 @@
|
|||
// removeStorage(item);
|
||||
// }
|
||||
// });
|
||||
navigateTo(1, '/pages/product/addGood/addGood', {
|
||||
mer_id: item.mer_id,
|
||||
product_id: item.product_id
|
||||
});
|
||||
let url = this.mer_info.type_code=='PersonalStore' ? '/pages/product/addGood/addGood_one' : '/pages/product/addGood/addGood';
|
||||
navigateTo(1, url, {
|
||||
mer_id: item.mer_id,
|
||||
product_id: item.product_id
|
||||
});
|
||||
},
|
||||
handleRecycle(item, index) {
|
||||
let that = this;
|
||||
|
|
Loading…
Reference in New Issue