faiz
/
hy-shop-mer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

edit

This commit is contained in:
faiz 2024-05-06 13:59:23 +08:00
parent f64ab85e63
commit be98df81fe
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@ -2,11 +2,11 @@
ENV = 'development' ENV = 'development'
# base api # base api
VUE_APP_BASE_API = 'http://192.168.1.131:8080' VUE_APP_BASE_API = 'http://192.168.1.107:8080'
# VUE_APP_BASE_API = 'https://plus.hwms.shop' # VUE_APP_BASE_API = 'https://plus.hwms.shop'
# socket 连接地址 # socket 连接地址
VUE_APP_WS_URL = 'ws://192.168.1.131:8080' VUE_APP_WS_URL = 'ws://192.168.1.107:8080'
# VUE_APP_WS_URL = 'ws://plus.hwms.shop' # VUE_APP_WS_URL = 'ws://plus.hwms.shop'
# vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,

2
src/views/product/addProduct/index.vue
View File

@ -2672,7 +2672,7 @@ export default {
val.price=val.price.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1') val.price=val.price.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1')
val.cost = (e * val.proportion).toFixed(2) val.cost = (e * val.proportion).toFixed(2)
// val.growth = parseInt(val.price*(0.9-(val.cost/val.price))) // val.growth = parseInt(val.price*(0.9-(val.cost/val.price)))
val.growth = parseInt(val.price*val.proportion) val.growth = parseInt(val.price*0.5)
} }
if(i=='bar_code'){ if(i=='bar_code'){
val.bar_code = val.bar_code.replace(/[\W]/g,'') val.bar_code = val.bar_code.replace(/[\W]/g,'')

12
src/views/product/productList/index.vue
View File

@ -5,7 +5,7 @@
<el-form-item label="平台分类：" prop="cate_id"> <el-form-item label="平台分类：" prop="cate_id">
<el-cascader v-model="tableFrom.cate_id" class="selWidth" :options="categoryList" :props="props" clearable @change="getList(1)" /> <el-cascader v-model="tableFrom.cate_id" class="selWidth" :options="categoryList" :props="props" clearable @change="getList(1)" />
</el-form-item> </el-form-item>
<el-form-item label="商户分类：" prop="mer_cate_id"> <!-- <el-form-item label="商户分类：" prop="mer_cate_id">
<el-select v-model="tableFrom.mer_cate_id" placeholder="请选择" class="filter-item selWidth" clearable @change="getList(1)"> <el-select v-model="tableFrom.mer_cate_id" placeholder="请选择" class="filter-item selWidth" clearable @change="getList(1)">
<el-option v-for="item in merCateList" :key="item.value" :label="item.label" :value="item.value" /> <el-option v-for="item in merCateList" :key="item.value" :label="item.label" :value="item.value" />
</el-select> </el-select>
@ -22,7 +22,7 @@
<el-option label="默认设置" value="1" /> <el-option label="默认设置" value="1" />
<el-option label="自定义设置" value="2" /> <el-option label="自定义设置" value="2" />
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="商品状态：" prop="us_status"> <el-form-item label="商品状态：" prop="us_status">
<el-select v-model="tableFrom.us_status" placeholder="请选择" class="filter-item selWidth" clearable @change="getList"> <el-select v-model="tableFrom.us_status" placeholder="请选择" class="filter-item selWidth" clearable @change="getList">
<el-option v-for="item in productStatusList" :key="item.value" :label="item.label" :value="item.value" /> <el-option v-for="item in productStatusList" :key="item.value" :label="item.label" :value="item.value" />
@ -62,7 +62,7 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="系统表单：" prop="form_id"> <!-- <el-form-item label="系统表单：" prop="form_id">
<el-select <el-select
v-model="tableFrom.form_id" v-model="tableFrom.form_id"
placeholder="请选择" placeholder="请选择"
@ -78,7 +78,7 @@
:value="item.form_id" :value="item.form_id"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="关键字：" prop="keyword"> <el-form-item label="关键字：" prop="keyword">
<el-input v-model="tableFrom.keyword" placeholder="请输入商品名称，关键字" class="selWidth" clearable @keyup.enter.native="getList(1)" /> <el-input v-model="tableFrom.keyword" placeholder="请输入商品名称，关键字" class="selWidth" clearable @keyup.enter.native="getList(1)" />
</el-form-item> </el-form-item>
@ -424,7 +424,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="佣金设置" name="commission"> <!-- <el-tab-pane label="佣金设置" name="commission">
<el-form size="small" label-width="120px" :inline="false"> <el-form size="small" label-width="120px" :inline="false">
<el-form-item label="一级佣金比例："> <el-form-item label="一级佣金比例：">
<el-input-number v-model="batchData.extension_one" :precision="2" :step="0.1" :min="0" :max="1" class="width100" controls-position="right" /> <el-input-number v-model="batchData.extension_one" :precision="2" :step="0.1" :min="0" :max="1" class="width100" controls-position="right" />
@ -510,7 +510,7 @@
<div style="color:#F56464">注：批量设置价格为敏感操作，请谨慎操作！</div> <div style="color:#F56464">注：批量设置价格为敏感操作，请谨慎操作！</div>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-tab-pane> </el-tab-pane> -->
</el-tabs> </el-tabs>
</div> </div>
</div> </div>