Merge branch 'dev' of http://113.31.163.91:7777/quanshu/mp-ui-pc into dev

src/views/business/coupon/add.vue

@@ -38,11 +38,17 @@
             </el-input>
             <div class="tip">最低消费金额小于等于面值则为无门槛券</div>
           </el-form-item>
-          <el-form-item label="有效期:" prop="dueDays">
-            <el-input v-model.number="addData.dueDays" :readonly="readonly" placeholder="请输入有效期">
+          <el-form-item label="有效期限:" prop="dueDays">
+            <el-select v-model="addData.dueDays" clearable placeholder="请选择有效期限">
+              <el-option label="30天" :value="30"></el-option>
+              <el-option label="60天" :value="60"></el-option>
+              <el-option label="90天" :value="90"></el-option>
+              <el-option label="180天" :value="180"></el-option>
+            </el-select>
+            <!-- <el-input v-model.number="addData.dueDays" :readonly="readonly" placeholder="请输入有效期限">
               <template slot="prepend">领取之日起</template>
               <template slot="append">天有效</template>
-            </el-input>
+            </el-input> -->
           </el-form-item>
           <el-form-item label="使用说明:" prop="description">
             <el-input type="textarea" rows="4" :readonly="readonly" v-model="addData.description" placeholder="请输入使用说明 对用户可见"/>
@@ -116,7 +122,8 @@ export default {
       readonly: this.$route.name === 'View',
       addData: {
         ticketBoxList:[],
-        useArea: 0
+        useArea: 0,
+        dueDays: 90
       },
       addIng: false,
       rules: {

src/views/business/coupon/index.vue

@@ -37,7 +37,7 @@
           size="mini"
           @click="$router.push('/coupon/add')"
           v-hasPermi="['business:coupon:add']"
-        >添加券</el-button>
+        >生成优惠券</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>

src/views/business/goods/add.vue

@@ -63,15 +63,15 @@
           </el-form-item>
         </el-col>
         <el-col :span="23">
-          <el-form-item label="兑换价格:" prop="value">
-            <el-input v-model="addData.value" type="number" readonly placeholder="请输入兑换价格">
+          <el-form-item label="兑换盲豆数量:" prop="value">
+            <el-input v-model="addData.value" type="number" readonly placeholder="请输入兑换盲豆数量">
               <template slot="append">盲豆</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="23">
-          <el-form-item label="成本:" prop="cost">
-            <el-input v-model.number="addData.cost" type="number" placeholder="请输入商品成本">
+          <el-form-item label="采购价格:" prop="cost">
+            <el-input v-model.number="addData.cost" type="number" placeholder="请输入商品采购价格">
               <template slot="append">元</template>
             </el-input>
           </el-form-item>
@@ -137,7 +137,7 @@ export default {
           { pattern: /^([1-9]\d*)$/, message: "请输入正确的数字", trigger: ["blur", "change"] }
         ],
         cost: [
-          { required: false, message: '请输入成本', trigger: 'blur' },
+          { required: false, message: '请输入采购价格', trigger: 'blur' },
           { pattern: /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/, message: "请输入正确的金额，最多两位小数", trigger: ["blur", "change"] }
         ],
         quantity: [

src/views/business/goods/index.vue

@@ -75,7 +75,7 @@
           ¥{{$numberFormat(row.cost)}}
         </template>
       </el-table-column>
-      <el-table-column label="兑换盲豆" prop="exchangePrice">
+      <el-table-column label="兑换盲豆数量" prop="exchangePrice">
         <template slot-scope="{row}">
           {{$numberFormat(row.exchangePrice)}}
         </template>