Merge branch 'feature/8月-奥莱定制' into dev

# Conflicts:
#	src/views/game/cmh/prize-config.vue

src/views/game/cmh/prize-config.vue

@@ -172,13 +172,14 @@ export default {
         prizeName: { type: 'string', required: true, message: '请输入奖品名称' },
         prizeType: { required: true, message: '请选择奖品类型' }
       },
-      // imageType: {
-      //   // 0 抵金券1 折扣券2 兑换券3：积分
-      //   0: 'https://pic01-10001430.image.myqcloud.com/522b7c1e-dea4-4068-b0a3-0e07bc229b0d',
-      //   1: 'https://pic01-10001430.image.myqcloud.com/32fa9132-5aed-4f7f-8be1-a3f81f2e58f7',
-      //   2: 'https://pic01-10001430.image.myqcloud.com/029abce4-660c-4115-a70f-55ba8f626832',
-      //   3: 'https://pic01-10001430.image.myqcloud.com/7fbc9e9b-4115-4795-aea3-cd2c1ec8da63'
-      // },
+      imgeType: {
+        // 0 抵金券1 折扣券2 兑换券3：积分
+        0: 'https://pic01-10001430.image.myqcloud.com/522b7c1e-dea4-4068-b0a3-0e07bc229b0d',
+        1: 'https://pic01-10001430.image.myqcloud.com/32fa9132-5aed-4f7f-8be1-a3f81f2e58f7',
+        2: 'https://pic01-10001430.image.myqcloud.com/029abce4-660c-4115-a70f-55ba8f626832',
+        // 3: 'https://pic01-10001430.image.myqcloud.com/7fbc9e9b-4115-4795-aea3-cd2c1ec8da63'
+        3: 'https://pic01-10001430.image.myqcloud.com/522b7c1e-dea4-4068-b0a3-0e07bc229b0d'
+      },
       show: false,
       prizeForm: {
         winChance: 100,