yanghao
/
yunshengtai-admin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

临时撤回上次提交

master
xuwenbo 4 years ago
parent
7cc1c58143
commit
b53ed0fe4b
2 changed files with 171 additions and 171 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 172
      src/views/activity/combination/form.vue
  2. 170
      src/views/activity/seckill/form.vue

172
src/views/activity/combination/form.vue
Unescape View File

@ -63,7 +63,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="拼团时效(小时)" prop="effectiveTime"> <el-form-item label="拼团时效(单位小时)" prop="effectiveTime">
<el-input-number v-model="formValidate.effectiveTime" style="width: 500px;" /> <el-input-number v-model="formValidate.effectiveTime" style="width: 500px;" />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -187,91 +187,91 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<!-- <el-col v-bind="grid">--> <el-col v-bind="grid">
<!-- <el-form-item label="虚拟：">--> <el-form-item label="虚拟：">
<!-- <el-input-number :min="0" v-model="formValidate.sales" placeholder="请输入销量" :disabled="true"/>--> <el-input-number :min="0" v-model="formValidate.sales" placeholder="请输入销量" :disabled="true"/>
<!-- </el-form-item>--> </el-form-item>
<!-- </el-col>--> </el-col>
<!-- <el-col v-bind="grid">--> <el-col v-bind="grid">
<!-- <el-form-item label="排序：">--> <el-form-item label="排序：">
<!-- <el-input-number :min="0" v-model="formValidate.sort" placeholder="请输入排序" :disabled="true"/>--> <el-input-number :min="0" v-model="formValidate.sort" placeholder="请输入排序" :disabled="true"/>
<!-- </el-form-item>--> </el-form-item>
<!-- </el-col>--> </el-col>
<!-- <el-col :span="24">--> <el-col :span="24">
<!-- <el-form-item label="佣金设置：">--> <el-form-item label="佣金设置：">
<!-- <el-radio-group v-model="formValidate.is_sub" :disabled="true" >--> <el-radio-group v-model="formValidate.is_sub" :disabled="true" >
<!-- <el-radio :label="1" class="radio">单独设置</el-radio>--> <el-radio :label="1" class="radio">单独设置</el-radio>
<!-- <el-radio :label="0">默认设置</el-radio>--> <el-radio :label="0">默认设置</el-radio>
<!-- </el-radio-group>--> </el-radio-group>
<!-- </el-form-item>--> </el-form-item>
<!-- </el-col>--> </el-col>
<!-- <el-col :span="24" v-if="formValidate.is_sub === 1">--> <el-col :span="24" v-if="formValidate.is_sub === 1">
<!-- &lt;!&ndash;单规格返佣&ndash;&gt;--> <!--单规格返佣-->
<!-- <el-form-item label="" v-if="formValidate.spec_type === 0">--> <el-form-item label="" v-if="formValidate.spec_type === 0">
<!-- <el-table :data="oneFormValidate" border>--> <el-table :data="oneFormValidate" border>
<!-- <el-table-column prop="imageArr" label="图片" align="center">--> <el-table-column prop="imageArr" label="图片" align="center">
<!-- <template slot-scope="scope">--> <template slot-scope="scope">
<!-- <el-image :src="scope.row.pic" fit="contain">--> <el-image :src="scope.row.pic" fit="contain">
<!-- <div slot="error" class="image-slot">--> <div slot="error" class="image-slot">
<!-- <i class="el-icon-picture-outline"></i>--> <i class="el-icon-picture-outline"></i>
<!-- </div>--> </div>
<!-- </el-image>--> </el-image>
<!-- </template>--> </template>
<!-- </el-table-column>--> </el-table-column>
<!-- <el-table-column prop="price" label="售价" align="center" />--> <el-table-column prop="price" label="售价" align="center" />
<!-- <el-table-column prop="cost" label="成本价" align="center" />--> <el-table-column prop="cost" label="成本价" align="center" />
<!-- <el-table-column prop="ot_price" label="原价" align="center" />--> <el-table-column prop="ot_price" label="原价" align="center" />
<!-- <el-table-column prop="stock" label="库存" align="center" />--> <el-table-column prop="stock" label="库存" align="center" />
<!-- <el-table-column prop="pink_price" label="拼团价" align="center" />--> <el-table-column prop="pink_price" label="拼团价" align="center" />
<!-- <el-table-column prop="pink_stock" label="拼团库存" align="center" />--> <el-table-column prop="pink_stock" label="拼团库存" align="center" />
<!-- <el-table-column prop="bar_code" label="商品编号" align="center" />--> <el-table-column prop="bar_code" label="商品编号" align="center" />
<!-- <el-table-column prop="weight" label="重量（KG）" align="center" />--> <el-table-column prop="weight" label="重量（KG）" align="center" />
<!-- <el-table-column prop="volume" label="体积(m³" align="center" />--> <el-table-column prop="volume" label="体积(m³" align="center" />
<!-- <el-table-column prop="volume" label="一级返佣" align="center">--> <el-table-column prop="volume" label="一级返佣" align="center">
<!-- <template slot-scope="scope">--> <template slot-scope="scope">
<!-- <el-input type="text" v-model="scope.row.brokerage" :disabled="true"/>--> <el-input type="text" v-model="scope.row.brokerage" :disabled="true"/>
<!-- </template>--> </template>
<!-- </el-table-column>--> </el-table-column>
<!-- <el-table-column prop="volume" label="二级返佣" align="center">--> <el-table-column prop="volume" label="二级返佣" align="center">
<!-- <template slot-scope="scope">--> <template slot-scope="scope">
<!-- <el-input type="text" v-model="scope.row.brokerage_two" :disabled="true"/>--> <el-input type="text" v-model="scope.row.brokerage_two" :disabled="true"/>
<!-- </template>--> </template>
<!-- </el-table-column>--> </el-table-column>
<!-- </el-table>--> </el-table>
<!-- </el-form-item>--> </el-form-item>
<!-- <el-form-item label="" v-if="formValidate.spec_type === 1 && manyFormValidate.length">--> <el-form-item label="" v-if="formValidate.spec_type === 1 && manyFormValidate.length">
<!-- <el-table :data="manyFormValidate" border>--> <el-table :data="manyFormValidate" border>
<!-- <el-table-column prop="imageArr" label="图片" align="center">--> <el-table-column prop="imageArr" label="图片" align="center">
<!-- <template slot-scope="scope">--> <template slot-scope="scope">
<!-- <el-image :src="scope.row.pic" fit="contain">--> <el-image :src="scope.row.pic" fit="contain">
<!-- <div slot="error" class="image-slot">--> <div slot="error" class="image-slot">
<!-- <i class="el-icon-picture-outline"></i>--> <i class="el-icon-picture-outline"></i>
<!-- </div>--> </div>
<!-- </el-image>--> </el-image>
<!-- </template>--> </template>
<!-- </el-table-column>--> </el-table-column>
<!-- <el-table-column prop="price" label="售价" align="center" />--> <el-table-column prop="price" label="售价" align="center" />
<!-- <el-table-column prop="cost" label="成本价" align="center" />--> <el-table-column prop="cost" label="成本价" align="center" />
<!-- <el-table-column prop="ot_price" label="原价" align="center" />--> <el-table-column prop="ot_price" label="原价" align="center" />
<!-- <el-table-column prop="stock" label="库存" align="center" />--> <el-table-column prop="stock" label="库存" align="center" />
<!-- <el-table-column prop="pink_price" label="拼团价" align="center" />--> <el-table-column prop="pink_price" label="拼团价" align="center" />
<!-- <el-table-column prop="pink_stock" label="拼团库存" align="center" />--> <el-table-column prop="pink_stock" label="拼团库存" align="center" />
<!-- <el-table-column prop="bar_code" label="商品编号" align="center" />--> <el-table-column prop="bar_code" label="商品编号" align="center" />
<!-- <el-table-column prop="weight" label="重量（KG）" align="center" />--> <el-table-column prop="weight" label="重量（KG）" align="center" />
<!-- <el-table-column prop="volume" label="体积(m³" align="center" />--> <el-table-column prop="volume" label="体积(m³" align="center" />
<!-- <el-table-column prop="volume" label="一级返佣" align="center">--> <el-table-column prop="volume" label="一级返佣" align="center">
<!-- <template slot-scope="scope">--> <template slot-scope="scope">
<!-- <el-input type="text" v-model="scope.row.brokerage":disabled="true"/>--> <el-input type="text" v-model="scope.row.brokerage":disabled="true"/>
<!-- </template>--> </template>
<!-- </el-table-column>--> </el-table-column>
<!-- <el-table-column prop="volume" label="二级返佣" align="center">--> <el-table-column prop="volume" label="二级返佣" align="center">
<!-- <template slot-scope="scope">--> <template slot-scope="scope">
<!-- <el-input type="text" v-model="scope.row.brokerage_two":disabled="true"/>--> <el-input type="text" v-model="scope.row.brokerage_two":disabled="true"/>
<!-- </template>--> </template>
<!-- </el-table-column>--> </el-table-column>
<!-- </el-table>--> </el-table>
<!-- </el-form-item>--> </el-form-item>
<!-- </el-col>--> </el-col>
</el-row> </el-row>
<el-form-item> <el-form-item>
<el-button type="primary" class="submission" @click="handleSubmit('formValidate')">保存</el-button> <el-button type="primary" class="submission" @click="handleSubmit('formValidate')">保存</el-button>

170
src/views/activity/seckill/form.vue
Unescape View File

@ -193,91 +193,91 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<!-- <el-col v-bind="grid">--> <el-col v-bind="grid">
<!-- <el-form-item label="虚拟：">--> <el-form-item label="虚拟：">
<!-- <el-input-number :min="0" v-model="formValidate.sales" placeholder="请输入销量" :disabled="true"/>--> <el-input-number :min="0" v-model="formValidate.sales" placeholder="请输入销量" :disabled="true"/>
<!-- </el-form-item>--> </el-form-item>
<!-- </el-col>--> </el-col>
<!-- <el-col v-bind="grid">--> <el-col v-bind="grid">
<!-- <el-form-item label="排序：">--> <el-form-item label="排序：">
<!-- <el-input-number :min="0" v-model="formValidate.sort" placeholder="请输入排序" :disabled="true"/>--> <el-input-number :min="0" v-model="formValidate.sort" placeholder="请输入排序" :disabled="true"/>
<!-- </el-form-item>--> </el-form-item>
<!-- </el-col>--> </el-col>
<!-- <el-col :span="24">--> <el-col :span="24">
<!-- <el-form-item label="佣金设置：">--> <el-form-item label="佣金设置：">
<!-- <el-radio-group v-model="formValidate.is_sub" :disabled="true" >--> <el-radio-group v-model="formValidate.is_sub" :disabled="true" >
<!-- <el-radio :label="1" class="radio">单独设置</el-radio>--> <el-radio :label="1" class="radio">单独设置</el-radio>
<!-- <el-radio :label="0">默认设置</el-radio>--> <el-radio :label="0">默认设置</el-radio>
<!-- </el-radio-group>--> </el-radio-group>
<!-- </el-form-item>--> </el-form-item>
<!-- </el-col>--> </el-col>
<!-- <el-col :span="24" v-if="formValidate.is_sub === 1">--> <el-col :span="24" v-if="formValidate.is_sub === 1">
<!-- &lt;!&ndash;单规格返佣&ndash;&gt;--> <!--单规格返佣-->
<!-- <el-form-item label="" v-if="formValidate.spec_type === 0">--> <el-form-item label="" v-if="formValidate.spec_type === 0">
<!-- <el-table :data="oneFormValidate" border>--> <el-table :data="oneFormValidate" border>
<!-- <el-table-column prop="imageArr" label="图片" align="center">--> <el-table-column prop="imageArr" label="图片" align="center">
<!-- <template slot-scope="scope">--> <template slot-scope="scope">
<!-- <el-image :src="scope.row.pic" fit="contain">--> <el-image :src="scope.row.pic" fit="contain">
<!-- <div slot="error" class="image-slot">--> <div slot="error" class="image-slot">
<!-- <i class="el-icon-picture-outline"></i>--> <i class="el-icon-picture-outline"></i>
<!-- </div>--> </div>
<!-- </el-image>--> </el-image>
<!-- </template>--> </template>
<!-- </el-table-column>--> </el-table-column>
<!-- <el-table-column prop="price" label="售价" align="center" />--> <el-table-column prop="price" label="售价" align="center" />
<!-- <el-table-column prop="cost" label="成本价" align="center" />--> <el-table-column prop="cost" label="成本价" align="center" />
<!-- <el-table-column prop="ot_price" label="原价" align="center" />--> <el-table-column prop="ot_price" label="原价" align="center" />
<!-- <el-table-column prop="stock" label="库存" align="center" />--> <el-table-column prop="stock" label="库存" align="center" />
<!-- <el-table-column prop="pink_price" label="秒杀价" align="center" />--> <el-table-column prop="pink_price" label="秒杀价" align="center" />
<!-- <el-table-column prop="pink_stock" label="秒杀库存" align="center" />--> <el-table-column prop="pink_stock" label="秒杀库存" align="center" />
<!-- <el-table-column prop="bar_code" label="商品编号" align="center" />--> <el-table-column prop="bar_code" label="商品编号" align="center" />
<!-- <el-table-column prop="weight" label="重量（KG）" align="center" />--> <el-table-column prop="weight" label="重量（KG）" align="center" />
<!-- <el-table-column prop="volume" label="体积(m³" align="center" />--> <el-table-column prop="volume" label="体积(m³" align="center" />
<!-- <el-table-column prop="volume" label="一级返佣" align="center">--> <el-table-column prop="volume" label="一级返佣" align="center">
<!-- <template slot-scope="scope">--> <template slot-scope="scope">
<!-- <el-input type="text" v-model="scope.row.brokerage" :disabled="true"/>--> <el-input type="text" v-model="scope.row.brokerage" :disabled="true"/>
<!-- </template>--> </template>
<!-- </el-table-column>--> </el-table-column>
<!-- <el-table-column prop="volume" label="二级返佣" align="center">--> <el-table-column prop="volume" label="二级返佣" align="center">
<!-- <template slot-scope="scope">--> <template slot-scope="scope">
<!-- <el-input type="text" v-model="scope.row.brokerage_two" :disabled="true"/>--> <el-input type="text" v-model="scope.row.brokerage_two" :disabled="true"/>
<!-- </template>--> </template>
<!-- </el-table-column>--> </el-table-column>
<!-- </el-table>--> </el-table>
<!-- </el-form-item>--> </el-form-item>
<!-- <el-form-item label="" v-if="formValidate.spec_type === 1 && manyFormValidate.length">--> <el-form-item label="" v-if="formValidate.spec_type === 1 && manyFormValidate.length">
<!-- <el-table :data="manyFormValidate" border>--> <el-table :data="manyFormValidate" border>
<!-- <el-table-column prop="imageArr" label="图片" align="center">--> <el-table-column prop="imageArr" label="图片" align="center">
<!-- <template slot-scope="scope">--> <template slot-scope="scope">
<!-- <el-image :src="scope.row.pic" fit="contain">--> <el-image :src="scope.row.pic" fit="contain">
<!-- <div slot="error" class="image-slot">--> <div slot="error" class="image-slot">
<!-- <i class="el-icon-picture-outline"></i>--> <i class="el-icon-picture-outline"></i>
<!-- </div>--> </div>
<!-- </el-image>--> </el-image>
<!-- </template>--> </template>
<!-- </el-table-column>--> </el-table-column>
<!-- <el-table-column prop="price" label="售价" align="center" />--> <el-table-column prop="price" label="售价" align="center" />
<!-- <el-table-column prop="cost" label="成本价" align="center" />--> <el-table-column prop="cost" label="成本价" align="center" />
<!-- <el-table-column prop="ot_price" label="原价" align="center" />--> <el-table-column prop="ot_price" label="原价" align="center" />
<!-- <el-table-column prop="stock" label="库存" align="center" />--> <el-table-column prop="stock" label="库存" align="center" />
<!-- <el-table-column prop="seckill_price" label="秒杀价" align="center" />--> <el-table-column prop="seckill_price" label="秒杀价" align="center" />
<!-- <el-table-column prop="seckill_stock" label="秒杀库存" align="center" />--> <el-table-column prop="seckill_stock" label="秒杀库存" align="center" />
<!-- <el-table-column prop="bar_code" label="商品编号" align="center" />--> <el-table-column prop="bar_code" label="商品编号" align="center" />
<!-- <el-table-column prop="weight" label="重量（KG）" align="center" />--> <el-table-column prop="weight" label="重量（KG）" align="center" />
<!-- <el-table-column prop="volume" label="体积(m³" align="center" />--> <el-table-column prop="volume" label="体积(m³" align="center" />
<!-- <el-table-column prop="volume" label="一级返佣" align="center">--> <el-table-column prop="volume" label="一级返佣" align="center">
<!-- <template slot-scope="scope">--> <template slot-scope="scope">
<!-- <el-input type="text" v-model="scope.row.brokerage":disabled="true"/>--> <el-input type="text" v-model="scope.row.brokerage":disabled="true"/>
<!-- </template>--> </template>
<!-- </el-table-column>--> </el-table-column>
<!-- <el-table-column prop="volume" label="二级返佣" align="center">--> <el-table-column prop="volume" label="二级返佣" align="center">
<!-- <template slot-scope="scope">--> <template slot-scope="scope">
<!-- <el-input type="text" v-model="scope.row.brokerage_two":disabled="true"/>--> <el-input type="text" v-model="scope.row.brokerage_two":disabled="true"/>
<!-- </template>--> </template>
<!-- </el-table-column>--> </el-table-column>
<!-- </el-table>--> </el-table>
<!-- </el-form-item>--> </el-form-item>
<!-- </el-col>--> </el-col>
</el-row> </el-row>
<el-form-item> <el-form-item>
<el-button type="primary" class="submission" @click="handleSubmit('formValidate')">保存</el-button> <el-button type="primary" class="submission" @click="handleSubmit('formValidate')">保存</el-button>

Write Preview
Loading…
Cancel
Save