Auto stash before merge of "master" and "origin/master"

src/modules/home/components/ImgShow.vue

@@ -46,8 +46,9 @@ export default {
   .show_content {
     padding: 0.21rem 0.3rem 3.13rem 0.3rem;
     .show_content_img {
-      margin-top: 0.84rem;
+      // margin-top: 0.84rem;
       width: 6.9rem;
+      margin: 0.84rem auto;
     }
   }
   .main_footer {

src/modules/home/components/SignForm.vue

@@ -16,12 +16,16 @@
               <!-- 输入框 -->
               <div v-if="item.type === 'input'">
                 <van-field
+                  :type="item.inputType"
                   ref="input"
                   v-model="item.value"
                   :name="item.key"
                   :label="item.name"
                   :placeholder="item.placeholder"
-                  :rules="[{ required: item.required, message: item.placeholder }]"
+                  :rules="[
+                    { required: item.required, message: item.placeholder, trigger: item.trigger },
+                    { pattern: item.pattern, message: item.msg, trigger: item.trigger }
+                  ]"
                   clearable
                   :border="true"
                   :disabled="!item.enable_edit"
@@ -59,7 +63,7 @@
                     show-toolbar
                     :columns="item.optionList"
                     @confirm="onConfirm"
-                    @cancel="showPicker = false"
+                    @cancel="item.showPicker = false"
                   />
                 </van-popup>
                 <div class="line"></div>
@@ -78,7 +82,7 @@
                 />
                 <!-- 时间弹框 -->
                 <van-popup v-model="item.showPicker" position="bottom">
-                  <van-datetime-picker type="datetime" @confirm="onConfirmTime" @cancel="showPickerTime = false" />
+                  <van-datetime-picker type="datetime" @confirm="onConfirmTime" @cancel="item.showPicker = false" />
                 </van-popup>
                 <div class="line"></div>
               </div>
@@ -131,14 +135,13 @@ export default {
       type: Array
     }
   },
+  computed: {},
   data() {
     return {
       title: '报名',
       checkedPay: false, // 勾选是否跳过按钮
       index: 0,
-      cIndex: 0,
-      showPicker: false,
-      showPickerTime: false
+      cIndex: 0
     }
   },
   mounted() {},
@@ -146,6 +149,7 @@ export default {
     isRemoveInfo(item) {
       return !!item.find(f => f.enable_edit === false)
     },
+
     // 提交
     onSubmit() {
       console.log(this.data, '123')

src/modules/home/views/Index.vue

@@ -43,7 +43,7 @@
         >
           <div class="activity_list_top">
             <div class="activity_list_top_tit">{{ item.name }}</div>
-            <div class="activity_list_top_date">{{ item.activity_time }}</div>
+            <div class="activity_list_top_date">{{ item.activity_time.split(' ')[0] }}</div>
           </div>
           <div class="activity_list_bottom">
             <van-icon name="arrow" size="14" />
@@ -175,7 +175,8 @@ export default {
               .catch(() => {})
           }
         }
-      } else if (time > endTime) {
+      } else if (time >= endTime) {
+        console.log('111')
         Toast(`该活动已于${item.end_time}结束报名`)
       } else if (time < startTime) {
         Toast(`该活动已于${item.start_time}开始报名`)

src/modules/home/views/OrderConfirm.vue

@@ -31,7 +31,7 @@
         </div>
       </div>
       <div class="main_footer">
-        <van-checkbox v-model="isAll" @click="checkAll">全选</van-checkbox>
+        <van-checkbox v-model="isAll" @click="checkAll" :disabled="!!getPayLength.length">全选</van-checkbox>
         <div class="main_footer_total">
           <div class="main_footer_total_top"></div>
           <div class="main_footer_total_top">
@@ -57,7 +57,6 @@
 import { getPayInfo } from '../api'
 import PayDetail from './PayDetail.vue'
 import Commonheader from '../components/Commonheader.vue'
-import { Toast } from 'vant'
 export default {
   components: { Commonheader, PayDetail },
   props: {
@@ -81,20 +80,26 @@ export default {
   },
 
   computed: {
+    // 合计价格
     totalPrice() {
       return this.selctOrderData
         .map(item => Number(item.pay_record.pay_amount))
         .reduce((pre, nex) => (pre += nex), 0)
         .toFixed(2)
     },
+    // 支付金额 每个的实付价
     payPrice() {
       return this.data.payData.pay_price
     },
+    // 共优惠价格
     totalCompanyPrice() {
       return this.selctOrderData
         .map(item => Number(this.payPrice) - Number(item.pay_record.pay_amount))
         .reduce((pre, nex) => (pre += nex), 0)
         .toFixed(2)
+    },
+    getPayLength() {
+      return this.stepOrderInfo.filter(item => item.pay_record.pay_status === '1')
     }
   },
   mounted() {
@@ -139,7 +144,6 @@ export default {
       this.getPayDetail()
     },
     getPayDetail() {
-      console.log(this.stepOrderInfo, 'orderifno')
       if (this.stepOrderInfo.length) {
         this.stepOrderInfo.forEach((item, index) => {
           if (item.pay_record.pay_status === '1') {
@@ -154,7 +158,6 @@ export default {
         pay_record_ids: this.selctOrderData.map(item => item.pay_record.id).toString(),
         join_rand: this.data.payData.join_rand
       }
-      console.log(this.data, 'selecer')
       getPayInfo(params).then(res => {
         if (res.code === 0) {
           this.payDetail = Object.assign({ qrData: res.data }, this.data)

src/modules/home/views/PayDetail.vue

@@ -2,11 +2,11 @@
   <div class="main">
     <commonheader :title="title" />
     <div class="main_content">
-      <div class="main_content_desc">1.打开支付宝扫码二维码支付，或长按保存二维码打开支付宝支付。</div>
+      <div class="main_content_desc">打开支付宝扫码二维码支付，或长按保存二维码打开支付宝支付。</div>
       <div class="main_content_qdCode">
         <qrcode-vue :value="payDetail.url" size="180" ref="qrcode" />
       </div>
-      <div class="main_content_link">
+      <!-- <div class="main_content_link">
         2.
         <el-button
           class="link"
@@ -18,7 +18,7 @@
           ><img class="link_img" src="https://webapp-pub.ezijing.com/highway/h5/ilink.png" />支付链接</el-button
         >
         复制链接在浏览器打开去支付
-      </div>
+      </div> -->
       <div class="main_btn">
         <van-button class="main_btn_home" round @click="$router.push('/')" v-if="isLastStep && status == 1"
           >首页</van-button
@@ -36,8 +36,8 @@
 
 <script>
 import QrcodeVue from 'qrcode.vue'
-import Clipboard from 'clipboard'
-import { Toast } from 'vant'
+// import Clipboard from 'clipboard'
+// import { Toast } from 'vant'
 import { getPayStatus } from '../api'
 
 import commonheader from '../components/Commonheader.vue'
@@ -76,33 +76,35 @@ export default {
     }
   },
   methods: {
+    // 获取二维码
     getQrcodeUrl() {
       this.qrcodeUrl = this.$refs.qrcode.$el
         .querySelector('canvas')
         .toDataURL('image/png')
         .replace('image/png', 'image/octet-stream')
     },
-    initClipboard() {
-      if (this.clipboard) {
-        return
-      }
-      this.clipboard = new Clipboard(this.$refs.copy.$el)
-      this.clipboard.on('success', () => {
-        Toast.success('复制成功！')
-        this.clipboard.destroy()
-      })
-      this.clipboard.on('error', () => {
-        Toast.fail('复制失败，请重新复制！')
-        this.clipboard.destroy()
-      })
-    },
+    // 复制链接
+    // initClipboard() {
+    //   if (this.clipboard) {
+    //     return
+    //   }
+    //   this.clipboard = new Clipboard(this.$refs.copy.$el)
+    //   this.clipboard.on('success', () => {
+    //     Toast.success('复制成功！')
+    //     this.clipboard.destroy()
+    //   })
+    //   this.clipboard.on('error', () => {
+    //     Toast.fail('复制失败，请重新复制！')
+    //     this.clipboard.destroy()
+    //   })
+    // },
+    // 获取支付状态
     getPayStatus() {
       this.getActivityDetail()
       const params = {
         order_id: this.data.order_id
       }
       getPayStatus(params).then(res => {
-        console.log(this.data, 'pddata')
         if (res.code === 0) {
           this.status = res.data.status
           if (res.data.status === 1) {
@@ -116,8 +118,8 @@ export default {
         }
       })
     },
+    // 获取活动详情
     getActivityDetail() {
-      console.log(this.stepList.length, this.data.num)
       if (this.stepList.length === this.data.num) {
         this.isLastStep = true
       }
@@ -141,7 +143,7 @@ export default {
       this.getPayStatus()
     }, 5000)
     this.getQrcodeUrl()
-    this.initClipboard()
+    // this.initClipboard()
   }
 }
 </script>
@@ -170,19 +172,19 @@ export default {
       height: 2.84rem;
       padding: 0.78rem 1.64rem 0 1.34rem;
     }
-    .main_content_link {
-      font-size: 0.3rem;
-      font-weight: 400;
-      color: #333333;
-      margin-top: 1.99rem;
-      .link {
-        color: #b80140;
-        .link_img {
-          width: 0.3017rem;
-          height: 0.3rem;
-        }
-      }
-    }
+    // .main_content_link {
+    //   font-size: 0.3rem;
+    //   font-weight: 400;
+    //   color: #333333;
+    //   margin-top: 1.99rem;
+    //   .link {
+    //     color: #b80140;
+    //     .link_img {
+    //       width: 0.3017rem;
+    //       height: 0.3rem;
+    //     }
+    //   }
+    // }
     .main_btn {
       margin-top: 1.12rem;
       margin-bottom: 0.64rem;

src/utils/formList.js

 const allFormList = [
-  { type: 'input', name: '姓名', placeholder: '请输入姓名', required: true, key: 'name', value: '', enable_edit: true },
+  {
+    type: 'input',
+    name: '姓名',
+    placeholder: '请输入姓名',
+    required: true,
+    key: 'name',
+    value: '',
+    enable_edit: true,
+    inputType: '',
+    trigger: 'onBlur',
+    msg: '',
+    pattern: ''
+  },
   {
     type: 'input',
     name: '电话',
@@ -7,7 +19,11 @@ const allFormList = [
     required: true,
     key: 'mobile',
     value: '',
-    enable_edit: true
+    enable_edit: true,
+    inputType: 'tel',
+    trigger: 'onBlur',
+    msg: '请输入正确的手机号',
+    pattern: /^1[3-9]d{9}$/
   },
   {
     type: 'radio',
@@ -20,7 +36,10 @@ const allFormList = [
       { id: '0', option: '未知' },
       { id: '1', option: '男' },
       { id: '2', option: '女' }
-    ]
+    ],
+    trigger: 'onChange',
+    msg: '',
+    pattern: ''
   },
   {
     type: 'input',
@@ -29,7 +48,11 @@ const allFormList = [
     required: true,
     key: 'email',
     value: '',
-    enable_edit: true
+    enable_edit: true,
+    inputType: '',
+    trigger: 'onBlur',
+    msg: '请输入正确的邮箱',
+    pattern: /[\d\w]+\b@[a-zA-ZA-z0-9]+\.[a-z]+/g
   },
   {
     type: 'input',
@@ -38,7 +61,11 @@ const allFormList = [
     required: true,
     key: 'company',
     value: '',
-    enable_edit: true
+    enable_edit: true,
+    inputType: '',
+    trigger: 'onBlur',
+    msg: '',
+    pattern: ''
   },
   {
     type: 'input',
@@ -47,7 +74,11 @@ const allFormList = [
     required: true,
     key: 'position',
     value: '',
-    enable_edit: true
+    enable_edit: true,
+    inputType: '',
+    trigger: 'onBlur',
+    msg: '',
+    pattern: ''
   },
   {
     type: 'input',
@@ -56,7 +87,11 @@ const allFormList = [
     required: true,
     key: 'id_number',
     value: '',
-    enable_edit: true
+    enable_edit: true,
+    inputType: '',
+    trigger: 'onBlur',
+    msg: '请输入正确的身份证号码',
+    pattern: /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/
   },
   {
     type: 'input',
@@ -65,7 +100,11 @@ const allFormList = [
     required: true,
     key: 'number',
     value: '',
-    enable_edit: true
+    enable_edit: true,
+    inputType: 'number',
+    trigger: 'onBlur',
+    msg: '',
+    pattern: ''
   },
   {
     type: 'input',
@@ -74,7 +113,11 @@ const allFormList = [
     required: true,
     key: 'country',
     value: '',
-    enable_edit: true
+    enable_edit: true,
+    inputType: '',
+    trigger: 'onBlur',
+    msg: '',
+    pattern: ''
   },
   {
     type: 'input',
@@ -83,9 +126,25 @@ const allFormList = [
     required: true,
     key: 'provinces',
     value: '',
-    enable_edit: true
+    enable_edit: true,
+    inputType: '',
+    trigger: 'onBlur',
+    msg: '',
+    pattern: ''
+  },
+  {
+    type: 'input',
+    name: '城市',
+    placeholder: '请输入城市',
+    required: true,
+    key: 'city',
+    value: '',
+    enable_edit: true,
+    inputType: '',
+    trigger: 'onBlur',
+    msg: '',
+    pattern: ''
   },
-  { type: 'input', name: '城市', placeholder: '请输入城市', required: true, key: 'city', value: '', enable_edit: true },
   {
     type: 'input',
     name: '地址',
@@ -93,7 +152,11 @@ const allFormList = [
     required: true,
     key: 'address',
     value: '',
-    enable_edit: true
+    enable_edit: true,
+    inputType: '',
+    trigger: 'onBlur',
+    msg: '',
+    pattern: ''
   },
   {
     type: 'input',
@@ -102,7 +165,11 @@ const allFormList = [
     required: true,
     key: 'fixed_telephone',
     value: '',
-    enable_edit: true
+    enable_edit: true,
+    inputType: 'tel',
+    trigger: 'onBlur',
+    msg: '请输入正确的固话',
+    pattern: /d{3}-d{8}|d{4}-d{7}/
   },
   {
     type: 'input',
@@ -111,9 +178,24 @@ const allFormList = [
     required: true,
     key: 'industry',
     value: '',
-    enable_edit: true
+    enable_edit: true,
+    inputType: '',
+    trigger: 'onBlur',
+    msg: '',
+    pattern: ''
+  },
+  {
+    type: 'input',
+    name: 'QQ',
+    placeholder: '请输入QQ',
+    required: true,
+    key: 'qq',
+    value: '',
+    enable_edit: true,
+    inputType: 'number',
+    trigger: 'onBlur',
+    msg: ''
   },
-  { type: 'input', name: 'QQ', placeholder: '请输入QQ', required: true, key: 'qq', value: '', enable_edit: true },
   {
     type: 'input',
     name: '微信',
@@ -121,9 +203,25 @@ const allFormList = [
     required: true,
     key: 'wechat',
     value: '',
-    enable_edit: true
+    enable_edit: true,
+    inputType: '',
+    trigger: 'onBlur',
+    msg: '',
+    pattern: ''
+  },
+  {
+    type: 'input',
+    name: '钉钉',
+    placeholder: '请输入钉钉',
+    required: true,
+    key: 'ding',
+    value: '',
+    enable_edit: true,
+    inputType: '',
+    trigger: 'onBlur',
+    msg: '',
+    pattern: ''
   },
-  { type: 'input', name: '钉钉', placeholder: '请输入钉钉', required: true, key: 'ding', value: '', enable_edit: true },
   {
     type: 'input',
     name: '微博',
@@ -131,7 +229,11 @@ const allFormList = [
     required: true,
     key: 'weibo',
     value: '',
-    enable_edit: true
+    enable_edit: true,
+    inputType: '',
+    msg: '',
+    trigger: 'onBlur',
+    pattern: ''
   },
   {
     type: 'select',
@@ -142,7 +244,10 @@ const allFormList = [
     required: true,
     optionList: ['有', '无'],
     showPicker: false,
-    enable_edit: true
+    enable_edit: true,
+    trigger: 'onBlur',
+    msg: '',
+    pattern: ''
   },
   {
     type: 'select',
@@ -152,8 +257,12 @@ const allFormList = [
     required: true,
     value: '',
     enable_edit: true,
+    inputType: '',
+    trigger: 'onChange',
     optionList: ['温馨大床房', '豪华标准间', '豪华套房'],
-    showPicker: false
+    showPicker: false,
+    msg: '',
+    pattern: ''
   },
   {
     type: 'datetime',
@@ -163,8 +272,12 @@ const allFormList = [
     required: true,
     value: '',
     enable_edit: true,
+    inputType: '',
+    trigger: 'onChange',
     optionList: [],
-    showPicker: false
+    showPicker: false,
+    msg: '',
+    pattern: ''
   },
   {
     type: 'datetime',
@@ -174,8 +287,12 @@ const allFormList = [
     required: true,
     value: '',
     enable_edit: true,
+    inputType: '',
     optionList: [],
-    showPicker: false
+    showPicker: false,
+    trigger: 'onChange',
+    msg: '',
+    pattern: ''
   }
 ]
 export default allFormList