惠美,返佣,用户调整,test环境部署命令
This commit is contained in:
parent
fa44bc735f
commit
3cd15fe9e1
|
|
@ -0,0 +1,11 @@
|
|||
NODE_ENV = production
|
||||
|
||||
# just a flag
|
||||
ENV = 'test'
|
||||
|
||||
# base api
|
||||
VUE_APP_BASE_API = ''
|
||||
|
||||
VUE_APP_WS_URL = ''
|
||||
|
||||
# VUE_APP_OPEN_HTTP_URL = 'http://test.tropjoin.com'
|
||||
|
|
@ -8,6 +8,7 @@
|
|||
"dev": "vue-cli-service serve",
|
||||
"build:prod": "vue-cli-service build",
|
||||
"build:stage": "vue-cli-service build --mode staging",
|
||||
"build:test": "vue-cli-service build --mode test",
|
||||
"preview": "node build/index.js --preview",
|
||||
"lint": "eslint --ext .js,.vue src",
|
||||
"test:unit": "jest --clearCache && vue-cli-service test:unit",
|
||||
|
|
|
|||
|
|
@ -81,17 +81,6 @@
|
|||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<!-- <el-col :span="24">
|
||||
<el-form-item label="是否为惠美乡村:">
|
||||
<el-radio-group
|
||||
v-model="formValidate.is_huimei"
|
||||
:disabled='virStatus'
|
||||
>
|
||||
<el-radio :label="1" class="radio">是</el-radio>
|
||||
<el-radio :label="0">否</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-col> -->
|
||||
<el-col :span="24">
|
||||
<el-form-item label="平台商品分类：" prop="cate_id">
|
||||
<el-cascader
|
||||
|
|
@ -107,7 +96,7 @@
|
|||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-col :span="5">
|
||||
<el-form-item label="定制产品：">
|
||||
<el-radio-group
|
||||
:disabled="virStatus"
|
||||
|
|
@ -121,6 +110,17 @@
|
|||
</div> -->
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="19">
|
||||
<el-form-item label="惠美乡村产品:">
|
||||
<el-radio-group
|
||||
v-model="formValidate.is_huimei"
|
||||
:disabled="virStatus"
|
||||
>
|
||||
<el-radio :label="1" class="radio">是</el-radio>
|
||||
<el-radio :label="0">否</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<!-- <el-col :span="24">
|
||||
<el-form-item label="商户商品分类：">
|
||||
<el-cascader
|
||||
|
|
@ -710,7 +710,10 @@
|
|||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="其他资质：" prop="qualification.otherList">
|
||||
<el-form-item
|
||||
label="其他资质或惠美乡村文件："
|
||||
prop="qualification.otherList"
|
||||
>
|
||||
<el-upload
|
||||
class="upload-demo"
|
||||
ref="otherList"
|
||||
|
|
@ -2535,7 +2538,7 @@ const defaultObj = {
|
|||
product_type: 0,
|
||||
qualification_type: 0,
|
||||
remark: "",
|
||||
// is_huimei:0,
|
||||
is_huimei: 0,
|
||||
audit_type: 0,
|
||||
qualification: {
|
||||
production_name: "",
|
||||
|
|
|
|||
|
|
@ -157,7 +157,7 @@
|
|||
<el-input-number v-else v-model="scope.row[iii]" :min="0" class="priceBox" controls-position="right"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<template v-if="formValidate.extension_type === 1">
|
||||
<!-- <template v-if="formValidate.extension_type === 1">
|
||||
<el-table-column align="center" label="一级返佣(元)" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
<el-input-number v-model="scope.row.extension_one" :min="0" class="priceBox" controls-position="right"/>
|
||||
|
|
@ -168,7 +168,7 @@
|
|||
<el-input-number v-model="scope.row.extension_two" :min="0" class="priceBox" controls-position="right"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</template>
|
||||
</template> -->
|
||||
</el-table>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="formValidate.spec_type === 1" class="labeltop" label="规格列表：">
|
||||
|
|
@ -196,7 +196,7 @@
|
|||
<el-input-number v-else v-model="scope.row[iii]" :min="0" class="priceBox" controls-position="right"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<template v-if="formValidate.extension_type === 1">
|
||||
<!-- <template v-if="formValidate.extension_type === 1">
|
||||
<el-table-column align="center" label="一级返佣(元)" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
<el-input-number v-model="scope.row.extension_one" :min="0" class="priceBox" controls-position="right"/>
|
||||
|
|
@ -207,7 +207,7 @@
|
|||
<el-input-number v-model="scope.row.extension_two" :min="0" class="priceBox" controls-position="right"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</template>
|
||||
</template> -->
|
||||
</el-table>
|
||||
</el-form-item>
|
||||
<el-form-item label="商品详情：">
|
||||
|
|
|
|||
|
|
@ -342,7 +342,11 @@
|
|||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column prop="store_name" label="惠美乡村产品" min-width="230">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.is_huimei ? "是" : "否" }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="is_customize" label="定制产品" min-width="70">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.is_customize ? "是" : "否" }}
|
||||
|
|
|
|||
|
|
@ -190,6 +190,12 @@
|
|||
</div>
|
||||
</template>
|
||||
</li>
|
||||
<li class="item">
|
||||
<div class="item-title">惠美乡村产品：</div>
|
||||
<div class="value">
|
||||
{{ productData.is_huimei ? "是" : "否" }}
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
<ul v-if="productData.video_link" class="list">
|
||||
<li class="item item100">
|
||||
|
|
@ -272,7 +278,7 @@
|
|||
<span v-else class="priceBox" v-text="scope.row[iii]" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<template v-if="productData.extension_type === 1">
|
||||
<!-- <template v-if="productData.extension_type === 1">
|
||||
<el-table-column
|
||||
align="center"
|
||||
label="一级返佣(元)"
|
||||
|
|
@ -297,7 +303,7 @@
|
|||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</template>
|
||||
</template> -->
|
||||
</el-table>
|
||||
</template>
|
||||
<template v-if="productData.spec_type === 1">
|
||||
|
|
@ -349,7 +355,7 @@
|
|||
}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<template v-if="productData.extension_type === 1">
|
||||
<!-- <template v-if="productData.extension_type === 1">
|
||||
<el-table-column
|
||||
align="center"
|
||||
label="一级返佣(元)"
|
||||
|
|
@ -372,7 +378,7 @@
|
|||
}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</template>
|
||||
</template> -->
|
||||
</el-table>
|
||||
</template>
|
||||
</div>
|
||||
|
|
@ -485,9 +491,7 @@
|
|||
<div class="item-title">实际销量 ：</div>
|
||||
<div class="value">
|
||||
<span>
|
||||
{{
|
||||
productData.sales - productData.ficti
|
||||
}}
|
||||
{{ productData.sales - productData.ficti }}
|
||||
(指实际售出数量)</span
|
||||
>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -251,7 +251,7 @@
|
|||
<el-input v-model="scope.row[iii]" :type="formThead[iii].title==='商品编号'?'text':'number'" :min="0" class="priceBox" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<template v-if="formValidate.extension_type === 1">
|
||||
<!-- <template v-if="formValidate.extension_type === 1">
|
||||
<el-table-column align="center" label="一级返佣(元)" min-width="120">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.extension_one" type="number" :min="0" class="priceBox" />
|
||||
|
|
@ -262,7 +262,7 @@
|
|||
<el-input v-model="scope.row.extension_two" type="number" :min="0" class="priceBox" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
</template>
|
||||
</template> -->
|
||||
</el-table>
|
||||
</el-form-item>
|
||||
<!-- 多规格表格-->
|
||||
|
|
@ -290,7 +290,7 @@
|
|||
<el-input v-model="scope.row[iii]" :type="formThead[iii].title==='商品编号'?'text':'number'" class="priceBox" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<template v-if="formValidate.extension_type === 1">
|
||||
<!-- <template v-if="formValidate.extension_type === 1">
|
||||
<el-table-column align="center" label="一级返佣(元)" min-width="120">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.extension_one" type="number" :min="0" class="priceBox" />
|
||||
|
|
@ -301,7 +301,7 @@
|
|||
<el-input v-model="scope.row.extension_two" type="number" :min="0" class="priceBox" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
</template>
|
||||
</template> -->
|
||||
</el-table>
|
||||
</el-form-item>
|
||||
<el-form-item label="商品详情：">
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@
|
|||
<el-form-item label="用户昵称：" prop="nickname">
|
||||
<el-input v-model="userFrom.nickname" placeholder="请输入昵称" clearable class="selWidth" @keyup.enter.native="getList(1)" />
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="用户ID：" prop="uid">
|
||||
<el-form-item label="用户ID：" prop="uid">
|
||||
<el-input v-model="userFrom.uid" placeholder="请输入用户ID" clearable class="selWidth" @keyup.enter.native="getList(1)" />
|
||||
</el-form-item> -->
|
||||
</el-form-item>
|
||||
<el-form-item label="用户标签：" prop="label_id">
|
||||
<el-select v-model="userFrom.label_id" placeholder="请选择" class="selWidth" clearable filterable @change="getList(1)">
|
||||
<el-option value="">全部</el-option>
|
||||
|
|
@ -82,7 +82,7 @@
|
|||
<el-checkbox :value="checkedIds.indexOf(scope.row.uid) > -1 || (chkName === 'duo' && noChecked.indexOf(scope.row.uid) === -1)" @change="(v)=>changeOne(v,scope.row)" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column prop="uid" label="ID" min-width="60" /> -->
|
||||
<el-table-column prop="uid" label="ID" min-width="60" />
|
||||
<el-table-column label="头像" min-width="50">
|
||||
<template slot-scope="scope">
|
||||
<div class="demo-image__preview">
|
||||
|
|
|
|||
Loading…
Reference in New Issue