Merge branch 'cx' into 'dev'

fix:刮刮卡默认图片显示错误

See merge request !7

src/views/game/ggk/form.vue

@@ -167,9 +167,9 @@ export default {
       // banner背景图url   0:自定义 1:红色 2:黑金 3:霓虹灯
       banner: [
         { skinType: 0, code: '', imgUrl: ''}, // eslint-disable-line
-        { skinType: 1, code: '', imgUrl: require('../../../assets/img/1.1.jpg') }, // eslint-disable-line
-        { skinType: 2, code: '', imgUrl: require('../../../assets/img/1.2.jpg') }, // eslint-disable-line
-        { skinType: 3, code: '', imgUrl: require('../../../assets/img/1.3.jpg') } // eslint-disable-line
+        { skinType: 1, code: '', imgUrl: require('../../../assets/img/2.1.jpg') }, // eslint-disable-line
+        { skinType: 2, code: '', imgUrl: require('../../../assets/img/2.2.jpg') }, // eslint-disable-line
+        { skinType: 3, code: '', imgUrl: require('../../../assets/img/2.3.jpg') } // eslint-disable-line
       ],
       sortList: [{ label: '奖品1', value: 1 }, { label: '奖品2', value: 2 }, { label: '奖品3', value: 3 }, { label: '奖品4', value: 4 }, { label: '奖品5', value: 5 }, { label: '奖品6', value: 6 }, { label: '奖品7', value: 7 }, { label: '奖品8', value: 8 }, { label: '随机', value: null }],
       tableList: [{ prizeId: '', prizeType: '', prizeCount: null, prizeIntegral: null, prizeCardId: '', gameId: '', prizeStatus: 0, prizeSort: null, prizeRate: 0, cardName: '', cardType: null, cardDenomination: null, cardImageUrl: '', cardStock: null, wechatCardId: null, winRecordCode: 0, receiveCount: 0 }],