Merge branch 'master' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong_vue_store

src/common/enum/store/page/wxAppStyle/constants.js

@@ -1,4 +1,5 @@
 const pageStyle = [
+  { name: '默认', key: 'default', value: '' },
   { name: '风格一', key: '1', value: '1' },
   { name: '风格二', key: '2', value: '2' },
   { name: '风格三', key: '3', value: '3' },

src/views/client/wxapp/Style.vue

@@ -6,10 +6,10 @@
         <!-- 模板预览 -->
         <div class="preview fl-l">
           <a-carousel autoplay>
-            <template v-if="form.getFieldValue('style')">
+            <template>
               <div v-for="(item, index) in imageList" :key="index">
                 <img
-                  :src="`static/style/${form.getFieldValue('style')}/${item.name}${form.getFieldValue('style')}.png`"
+                  :src="`static/style/${form.getFieldValue('style') || 'default'}/${item.name}${form.getFieldValue('style')}.png`"
                 />
               </div>
             </template>
@@ -20,7 +20,7 @@
           <a-form :form="form" @submit="handleSubmit">
             <a-form-item label="页面风格" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-radio-group
-                v-decorator="['style', { rules: [{ required: true, message: '请选择页面风格' }]}]"
+                v-decorator="['style', { rules: [{ required: false, message: '请选择页面风格' }]}]"
               >
                 <a-radio
                   v-for="(item, index) in pageStyle"
@@ -77,7 +77,7 @@ export default {
         .then(result => {
           console.log(result)
           // 当前记录
-          this.record.style = result.data.detail.style || ''
+          this.record.style = result.data.detail ? (result.data.detail.style || '') : ''
           // 设置默认值
           this.setFieldsValue()
         })