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

更新

This commit is contained in:
weipengfei 2024-03-19 14:46:13 +08:00
parent 4537bbaa0f
commit d69560e61d
9 changed files with 76 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/activePopup.vue
View File

@ -5,7 +5,7 @@
<view class="c_card"> <view class="c_card">
<view class="c_content"> <view class="c_content">
<scroll-view style="height: 100%;" scroll-y> <scroll-view style="height: 100%;" scroll-y>
<view v-if="info.content" v-html="info.content.content"></view> <view v-if="info&&info.content&&info.content.content" v-html="info.content.content"></view>
</scroll-view> </scroll-view>
</view> </view>
</view> </view>

4
config/app.js
View File

@ -9,9 +9,9 @@ let httpApiThree
let wsApi let wsApi
// 在打包之前请检查当前环境是否正确 // 在打包之前请检查当前环境是否正确
const env = 'dev'; // 开发 // const env = 'dev'; // 开发
// const env = 'prod'; // 生产 // const env = 'prod'; // 生产
// const env = 'prew'; // 预上线 const env = 'prew'; // 预上线
switch (env) { switch (env) {
case 'prod': case 'prod':

12
pages.json
View File

@ -1675,14 +1675,14 @@
"iconPath": "static/tabbar_icon/s.png", "iconPath": "static/tabbar_icon/s.png",
"selectedIconPath": "static/tabbar_icon/s-a.png", "selectedIconPath": "static/tabbar_icon/s-a.png",
"text": "统计" "text": "统计"
},
{
"pagePath": "pages/nongKe/supply_chain/shopping_trolley",
"iconPath": "static/tabbar_icon/d.png",
"selectedIconPath": "static/tabbar_icon/d-a.png",
"text": "采购车"
} }
// { // {
// "pagePath": "pages/nongKe/supply_chain/shopping_trolley",
// "iconPath": "static/tabbar_icon/d.png",
// "selectedIconPath": "static/tabbar_icon/d-a.png",
// "text": "采购车"
// }
// {
// "pagePath": "pages/product/list/index", // "pagePath": "pages/product/list/index",
// "iconPath": "static/tabbar_icon/c.png", // "iconPath": "static/tabbar_icon/c.png",
// "selectedIconPath": "static/tabbar_icon/c-a.png", // "selectedIconPath": "static/tabbar_icon/c-a.png",

106
pages/index/index.vue
View File

@ -79,7 +79,7 @@
</view> </view>
</view> </view>
<view class="content-tools" style="margin-top: 30rpx;" <!-- <view class="content-tools" style="margin-top: 30rpx;"
v-if="$store.state.app.userInfo&&$store.state.app.userInfo.mer_info&&$store.state.app.userInfo.mer_info.type_code=='TypeSupplyChain'"> v-if="$store.state.app.userInfo&&$store.state.app.userInfo.mer_info&&$store.state.app.userInfo.mer_info.type_code=='TypeSupplyChain'">
<view class="tools-one" style="margin-bottom: 20rpx;"> <view class="tools-one" style="margin-bottom: 20rpx;">
转账订单 转账订单
@ -98,7 +98,7 @@
</view> </view>
</view> </view>
</view> </view> -->
<view class="content-tools"> <view class="content-tools">
<view class="tools-one"> <view class="tools-one">
@ -539,21 +539,21 @@
type: 13, type: 13,
image: require('@/static/images/index9.png') image: require('@/static/images/index9.png')
}, },
{ // {
name: '供货采购', // name: '供货采购',
type: 3, // type: 3,
image: require('@/static/images/index4.png') // image: require('@/static/images/index4.png')
}, // },
{ {
name: '扫码付款', name: '扫码付款',
type: 18, type: 18,
image: require('@/static/images/index25.png') image: require('@/static/images/index25.png')
}, },
{ // {
name: '进货管理', // name: '进货管理',
type: 4, // type: 4,
image: require('@/static/images/index5.png') // image: require('@/static/images/index5.png')
}, // },
{ {
name: '订单管理', name: '订单管理',
type: 2, type: 2,
@ -589,11 +589,11 @@
type: 17, type: 17,
image: require('@/static/images/index24.png') image: require('@/static/images/index24.png')
}, },
{ // {
name: '转账订单', // name: '转账订单',
type: 19, // type: 19,
image: require('@/static/images/index13.png') // image: require('@/static/images/index13.png')
}, // },
{ {
name: '提现管理', name: '提现管理',
type: 5, type: 5,
@ -671,16 +671,16 @@
type: 17, type: 17,
image: require('@/static/images/index24.png') image: require('@/static/images/index24.png')
}, },
{ // {
name: '供货采购', // name: '供货采购',
type: 3, // type: 3,
image: require('@/static/images/index4.png') // image: require('@/static/images/index4.png')
}, // },
{ // {
name: '进货管理', // name: '进货管理',
type: 4, // type: 4,
image: require('@/static/images/index5.png') // image: require('@/static/images/index5.png')
}, // },
{ {
name: '商户设置', name: '商户设置',
type: 12, type: 12,
@ -722,11 +722,11 @@
type: 5, type: 5,
image: require('@/static/images/index8.png') image: require('@/static/images/index8.png')
}, },
{ // {
name: '供货采购', // name: '供货采购',
type: 3, // type: 3,
image: require('@/static/images/index4.png') // image: require('@/static/images/index4.png')
}, // },
{ {
name: '提货付款', name: '提货付款',
type: 17, type: 17,
@ -747,16 +747,16 @@
type: 18, type: 18,
image: require('@/static/images/index25.png') image: require('@/static/images/index25.png')
}, },
{ // {
name: '进货管理', // name: '进货管理',
type: 4, // type: 4,
image: require('@/static/images/index5.png') // image: require('@/static/images/index5.png')
}, // },
{ // {
name: '转账订单', // name: '转账订单',
type: 19, // type: 19,
image: require('@/static/images/index13.png') // image: require('@/static/images/index13.png')
}, // },
{ {
name: '订单核销', name: '订单核销',
type: 7, type: 7,
@ -1264,17 +1264,17 @@
}) })
} }
); );
otherOrderStatistics(this.userInfoData.service.mer_id, data).then( // otherOrderStatistics(this.userInfoData.service.mer_id, data).then(
res => { // res => {
this.other_order[0].value = res.data.order.unshipped // this.other_order[0].value = res.data.order.unshipped
this.other_order[1].value = res.data.order.untake // this.other_order[1].value = res.data.order.untake
}, // },
err => { // err => {
that.$util.Tips({ // that.$util.Tips({
title: err.msg // title: err.msg
}) // })
} // }
); // );
}, },
open() { open() {
this.isshow = !this.isshow this.isshow = !this.isshow

2
pages/product/addGood/addGood.vue
View File

@ -395,7 +395,7 @@
}; };
productDetail(this.merId, this.product_id).then(async (res) => { productDetail(this.merId, this.product_id).then(async (res) => {
this.showCommodity = true; this.showCommodity = true;
if (res.data.content_arr.length > 0) res.data.content = res.data.content_arr; if (res.data.content_arr&&res.data.content_arr.length > 0) res.data.content = res.data.content_arr;
let editGoodsDetils = res.data; let editGoodsDetils = res.data;
Object.keys(this.setFormData).forEach(item => { Object.keys(this.setFormData).forEach(item => {
this.setFormData[item] = editGoodsDetils[item]; this.setFormData[item] = editGoodsDetils[item];

2
pages/product/addGood/addGood_one.vue
View File

@ -395,7 +395,7 @@
}; };
productDetail(this.merId, this.product_id).then(async (res) => { productDetail(this.merId, this.product_id).then(async (res) => {
this.showCommodity = true; this.showCommodity = true;
if (res.data.content_arr.length > 0) res.data.content = res.data.content_arr; if (res.data.content_arr&&res.data.content_arr.length > 0) res.data.content = res.data.content_arr;
let editGoodsDetils = res.data; let editGoodsDetils = res.data;
Object.keys(this.setFormData).forEach(item => { Object.keys(this.setFormData).forEach(item => {
this.setFormData[item] = editGoodsDetils[item]; this.setFormData[item] = editGoodsDetils[item];

2
pages/product/addGood/addGood_supply.vue
View File

@ -430,7 +430,7 @@
}; };
productDetail(this.merId, this.product_id).then(async (res) => { productDetail(this.merId, this.product_id).then(async (res) => {
this.showCommodity = true; this.showCommodity = true;
if (res.data.content_arr.length > 0) res.data.content = res.data.content_arr; if (res.data.content_arr&&res.data.content_arr.length > 0) res.data.content = res.data.content_arr;
let editGoodsDetils = res.data; let editGoodsDetils = res.data;
Object.keys(this.setFormData).forEach(item => { Object.keys(this.setFormData).forEach(item => {
this.setFormData[item] = editGoodsDetils[item]; this.setFormData[item] = editGoodsDetils[item];

2
pages/product/addGoods/index.vue
View File

@ -596,7 +596,7 @@
} }
productDetail(this.merId, this.product_id).then(res => { productDetail(this.merId, this.product_id).then(res => {
setStorage('editGoodsDetils', res.data); setStorage('editGoodsDetils', res.data);
if(res.data.content_arr.length>0) res.data.content = res.data.content_arr; if(res.data.content_arr&&res.data.content_arr.length>0) res.data.content = res.data.content_arr;
if(typeof res.data.content == 'string')res.data.content = JSON.parse(res.data.content); if(typeof res.data.content == 'string')res.data.content = JSON.parse(res.data.content);
this.$store.commit('setStorage', res.data); this.$store.commit('setStorage', res.data);
let editGoodsDetils = res.data; let editGoodsDetils = res.data;

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

@ -519,9 +519,6 @@
}, },
//线下 //线下
Fline(item) { Fline(item) {
this.checkboxList1 = item.attrValue
// console.log(this.checkboxList1.length)
if (this.checkboxList1.length>0){
navigateTo(1, '/pages/product/updateStock/updateStock', { navigateTo(1, '/pages/product/updateStock/updateStock', {
product_id: item.product_id product_id: item.product_id
}) })
@ -532,43 +529,6 @@
} }
}) })
}) })
} else if (this.checkboxList1.length > 0) {
uni.showLoading({
title: '加载中'
})
getPreviewProDetail({
id: item.product_id
}).then(res=>{
uni.hideLoading();
let att = res.data.attr.map(e=>{
return {
value: e.attr_name,
detail: e.attr_values
}
})
this.data.attr = att;
this.data.product_id = this.checkboxList1[0].product_id
this.data.unique = this.checkboxList1[0].unique
this.data.number = this.checkboxList1[0].stock
this.data.spec_type = item.spec_type
this.data.item = item
this.on_line = 1
this.show = true;
}).catch((e)=>{
uni.hideLoading();
uni.showToast({
title: e.msg||e.message||e
})
this.show = false;
})
} else {
this.show = false
navigateTo(1, '/pages/users/online_warehousing/index', {
mer_id: this.mer_id,
product_id: this.data.product_id,
unique: this.data.unique,
});
}
}, },
//导入 //导入
creat() { creat() {