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

更新

This commit is contained in:
weipengfei 2024-01-18 18:45:06 +08:00
parent d3e8fe6c96
commit 2d88fe3e6a
5 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/app.js
View File

@ -9,8 +9,8 @@ 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) {

4
manifest.json
View File

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

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

@ -355,7 +355,18 @@
} }
delete item.id; delete item.id;
delete item.stock; delete item.stock;
uni.navigateTo({ if(this.userInfo.mer_info.type_code=='TypeSupplyChain') uni.navigateTo({
url: `/pages/product/addGood/addGood_supply?mer_id=${this.userInfo.service.mer_id}&import=1`,
success: (e) => {
e.eventChannel.emit('importAttrValue', item);
uni.$once('importAttrValueOK', (e)=>{
this.goods = this.goods.filter(t=>{
return t.id!=e;
})
})
}
})
else uni.navigateTo({
url: `/pages/product/addGood/addGood?mer_id=${this.userInfo.service.mer_id}&import=1`, url: `/pages/product/addGood/addGood?mer_id=${this.userInfo.service.mer_id}&import=1`,
success: (e) => { success: (e) => {
e.eventChannel.emit('importAttrValue', item); e.eventChannel.emit('importAttrValue', item);

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

@ -687,7 +687,7 @@
showFlag = '结算价不能小于0' showFlag = '结算价不能小于0'
} }
if (!t.price || +t.price <= 0) showFlag = '零售价不能小于0'; if (!t.price || +t.price <= 0) showFlag = '零售价不能小于0';
if (!t.single_number || +t.single_number <= 0) showFlag = '零售价不能小于0'; // if (!t.single_number || +t.single_number <= 0) showFlag = '单件数量不能小于0';
if (!t.stock || +t.stock <= 0) showFlag = '库存不能小于0'; if (!t.stock || +t.stock <= 0) showFlag = '库存不能小于0';
// if (!t.cost || +t.cost <= 0) showFlag = '成本价不能小于0'; // if (!t.cost || +t.cost <= 0) showFlag = '成本价不能小于0';
}) })

13
pages/product/addGood/components/price_supply.vue
View File

@ -73,16 +73,17 @@
model: 'stock', model: 'stock',
holder: '请填写库存', holder: '请填写库存',
require: true, require: true,
}, { },
],
moreThanList: [
{
id: 11, id: 11,
label: '单件数量', label: '单件数量',
type: 'digit', type: 'digit',
model: 'single_number', model: 'single_number',
holder: '请填写单件数量', holder: '请填写单件数量',
require: true, require: false,
}, }, {
],
moreThanList: [{
id: 2, id: 2,
label: '成本价', label: '成本价',
type: 'digit', type: 'digit',
@ -179,7 +180,7 @@
spliceMoreThan() { spliceMoreThan() {
this.moreThanFlag = true; this.moreThanFlag = true;
// this.formList.splice(!this.$props.product_id ? 2 : 1, this.formList.length); // this.formList.splice(!this.$props.product_id ? 2 : 1, this.formList.length);
let len = 6; let len = 5;
if(this.$store.state.app?.userInfo?.mer_info?.type_code=="TypeSupplyChain") if(this.$store.state.app?.userInfo?.mer_info?.type_code=="TypeSupplyChain")
this.formList.splice(len, this.formList.length); this.formList.splice(len, this.formList.length);
else this.formList.splice(len-1, this.formList.length); else this.formList.splice(len-1, this.formList.length);