Merge branch 'dev' of mangpiao/mp-ui-pc into test

src/views/business/ticket/components/AwardsList.vue

@@ -48,6 +48,7 @@
             <el-table-column label="奖品名称" prop="title" >
               <template slot-scope="{ row }">
                 <div v-if="row.prizeType == 'coin' && row.value >= 0">盲豆 x{{ row.value }}</div>
+                <div v-else-if="row.prizeType == 'red_pkg' && row.value >= 0">微信红包 {{ $numberFormat(row.value) }} 元</div>
                 <div v-else>{{ row.title }}</div>
               </template>
             </el-table-column>

src/views/business/ticket/components/CoinAdd.vue

@@ -64,7 +64,7 @@ export default {
         quantity: 1,
         title: `盲豆 x${this.coinForm.quantity}`,
         picUrl: publicFileGetUrl + "md.png",
-        value: this.coinForm.quantity,
+        value: Number(this.coinForm.quantity),
         sortWeight: 100
       };
       this.$refs["coinForm"].validate((valid) => {

src/views/business/ticket/components/RedPkgAdd.vue

@@ -33,6 +33,7 @@
 </template>
 <script>
 import { publicFileGetUrl } from "@/api/common";
+import { accMul, accDiv } from "@/utils/util";
 export default{
   name: "RedPkgAdd",
   props: {
@@ -48,8 +49,9 @@ export default{
         quantity: [
           { required: true, message: "请输入金额", trigger: "blur" },
           {
-            pattern: /^([1-9]\d*)$/,
-            message: "请输入合法的金额数字，需要为正整数",
+            pattern:
+              /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/,
+            message: "请输入合法的金额数字，最多两位小数",
             trigger: ["blur", "change"],
           },
         ],
@@ -62,9 +64,9 @@ export default{
       let redPacket = {
         prizeType: "red_pkg",
         quantity: 1,
-        title: `微信红包 ${this.packetForm.quantity}元`,
+        title: `微信红包 ${this.packetForm.quantity} 元`,
         picUrl: publicFileGetUrl + "static/redPkg.png",
-        value: this.packetForm.quantity,
+        value: accMul(this.packetForm.quantity, 100),
         sortWeight: 100
       };
       this.$refs["packetForm"].validate((valid) => {

src/views/business/ticket/create.vue

@@ -567,7 +567,7 @@ export default {
                 refId: ele.goodsId || ele.couponId || ele.id,
                 prizeType: ele.prizeType,
                 quantity: ele.quantity,
-                value: Number(ele.value),
+                value: ele.value,
               };
             });
           });