Merge branch 'dev' into 'test'

Dev

See merge request quanshu/mp-ui-pc!16

src/views/business/coupon/add.vue

@@ -27,7 +27,7 @@
             <Upload :value="addData.picUrl ? [{ fileName: addData.picUrl }] : []" @input="addData.picUrl = $event[0] ? $event[0].fileName : ''" :limit="1" />
           </el-form-item> -->
           <el-form-item v-if="addData.type === 1" label="门店默认承担比例:" prop="channelSharedRate">
-            <el-input v-model.number="addData.channelSharedRate" :readonly="readonly" type="number" placeholder="请输入门店默认承担比例">
+            <el-input v-model="addData.channelSharedRate" :readonly="readonly" type="number" placeholder="请输入门店默认承担比例">
               <template slot="append">%</template>
             </el-input>
             <div class="tip">若门店承担100%，则核销后公司不需要打款给门店，依此类推。</div>
@@ -129,7 +129,10 @@ export default {
           { required: true, message: '请输入券面值', trigger: 'blur' },
           { pattern: /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/, message: "请输入正确的面值，最多两位小数", trigger: ["blur", "change"] }
         ],
-        channelSharedRate: [{ required: true, message: '请输入门店默认承担比例', trigger: 'blur' }],
+        channelSharedRate: [
+          { required: true, message: '请输入门店默认承担比例', trigger: 'blur' },
+          { pattern: /^100$|^(\d|[1-9]\d)(\.\d+)*$/, message: "请输入正确的百分比数字", trigger: ["blur", "change"] }
+        ],
         minOrderAmt: [
           { required: true, message: '请输入最低消费金额', trigger: 'blur' },
           { pattern: /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/, message: "请输入正确的金额，最多两位小数", trigger: ["blur", "change"] }

src/views/business/coupon/index.vue

@@ -65,7 +65,7 @@
         <template slot-scope="{row}">
           <el-button v-hasPermi="['business:coupon:query']" type="text" @click="$router.push('/coupon/view?id=' + row.couponId)">查看</el-button>
           <el-button v-if="JSON.parse(row.status).value === 'init'" v-hasPermi="['business:coupon:edit']" type="text" @click="$router.push('/coupon/edit?id=' + row.couponId)">编辑</el-button>
-          <el-button v-if="JSON.parse(row.status).value === 'off'" v-hasPermi="['business:coupon:on']" type="text" @click="setStatus(row, 'on')">上架</el-button>
+          <el-button v-if="JSON.parse(row.status).value === 'off' || JSON.parse(row.status).value === 'init'" v-hasPermi="['business:coupon:on']" type="text" @click="setStatus(row, 'on')">上架</el-button>
           <el-button v-if="JSON.parse(row.status).value === 'on'" v-hasPermi="['business:coupon:off']" type="text" @click="setStatus(row, 'off')">下架</el-button>
           <el-button v-if="JSON.parse(row.status).value === 'off'" v-hasPermi="['business:coupon:remove']" class="del" type="text" @click="del(row)">删除</el-button>
         </template>

src/views/business/goods/add.vue

@@ -58,7 +58,7 @@
         <el-col :span="23">
           <el-form-item label="兑换价格:" prop="exchangePrice">
             <el-input v-model="addData.exchangePrice" type="number" placeholder="请输入兑换价格">
-              <template slot="append">元</template>
+              <template slot="append">盲豆</template>
             </el-input>
           </el-form-item>
         </el-col>
@@ -126,7 +126,7 @@ export default {
         ],
         exchangePrice: [
           { required: true, message: '请输入兑换价格', trigger: 'blur' },
-          { pattern: /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/, message: "请输入正确的金额，最多两位小数", trigger: ["blur", "change"] }
+          { pattern: /^([1-9]\d*)$/, message: "请输入正确的数字", trigger: ["blur", "change"] }
         ],
         cost: [
           { required: true, message: '请输入成本', trigger: 'blur' },
@@ -150,7 +150,7 @@ export default {
         }) : []
       },
       set(val) {
-        this.addData.picUrl = val.map(item => { return item.fileName }).toString()
+        this.$set(this.addData, 'picUrl', val.map(item => { return item.fileName }).toString())
       }
     }
   },

src/views/business/goods/index.vue

@@ -59,7 +59,12 @@
         </template>
       </el-table-column>
       <el-table-column label="商品名称" prop="title" />
-      <el-table-column label="价格" prop="value" />
+      <el-table-column label="价格" prop="value">
+        <template slot-scope="{row}">¥{{ row.value }}</template>
+      </el-table-column>
+      <el-table-column label="成本" prop="cost">
+        <template slot-scope="{row}">¥{{ row.cost }}</template>
+      </el-table-column>
       <el-table-column label="兑换盲豆" prop="exchangePrice" />
       <el-table-column label="销量" prop="exchangedQty" />
       <el-table-column label="库存" prop="quantity" />