路由变更去掉页面跳转带有#的链接地址；健康券列表状态为“即将发放”的不跳转至券详情；

src/router/request.js

@@ -68,7 +68,7 @@ service.interceptors.response.use(response => {
           // router.push({
           //   path: '/recommend'
           // })
-          window.location.href = 'http://' + location.host + '/voucher/#/recommend/list'
+          window.location.href = 'http://' + location.host + '/voucher/recommend/list'
         }, 4 * 1000)
       }
     } else if (status === 404) {

src/router/requestSjkg.js

@@ -59,7 +59,7 @@ service.interceptors.response.use(response => {
           // router.push({
           //   path: '/recommend'
           // })
-          window.location.href = 'http://' + location.host + '/#/recommend/list'
+          window.location.href = 'http://' + location.host + '/recommend/list'
         }, 4 * 1000)
       }
     } else {

src/views/content/index.vue

@@ -72,7 +72,7 @@ export default {
           let that = this
           wxpermission(1, () => {
             let newShareLink = removeUrlParam('code')
-            newShareLink = newShareLink.split('#')[0] + '#/content?imprId=' + this.imprId
+            newShareLink = newShareLink.split('#')[0] + 'content?imprId=' + this.imprId
             const shareData = {
               title: that.data.mainTitle,
               imgUrl: that.data.cover,

src/views/home/index.vue

@@ -55,7 +55,7 @@ export default {
     //   //     path: '/recommend'
     //   //   })
     //   // }, 2000)
-    //   // window.location.href = 'http://' + location.host + '/#/recommend/list'
+    //   // window.location.href = 'http://' + location.host + '/recommend/list'
     // }, false)
 
     this.getUserCardByIdFn() // 获取当前用户待使用健康券(前3条)

src/views/signing/index.vue

@@ -143,8 +143,12 @@
             <i class="close-btn glyphicon glyphicon-remove-circle" @click="removeChooseImgsByIndex('1', index)" v-if="signStatus==='create'"></i>
           </li>
           <li v-if="ChoosePlusVisible">
-            <span class="upload-plus" @click="handelChooseImage(1)">
-              <i class="glyphicon glyphicon-plus"></i>
+            <span class="upload-plus idCard-upload-plus" @click="handelChooseImage(1)">
+              <h4 v-if="BaseForm.chooseImagesIds.length === 0">正面</h4>
+              <p v-if="BaseForm.chooseImagesIds.length === 0">点击上传身份证正面</p>
+              <h4 v-if="BaseForm.chooseImagesIds.length === 1">反面</h4>
+              <p v-if="BaseForm.chooseImagesIds.length === 1">点击上传身份证反面</p>
+              <!-- <i class="glyphicon glyphicon-plus"></i> -->
             </span>
           </li>
         </ul>
@@ -264,7 +268,7 @@
         </span>
       </div>
       <div class="footer">
-        <button class="btn-default btn-block" @click="confirmSignature">确认签约</button>
+        <button class="btn-default btn-block" :class="confirmSignatureDisabled?'disabled':''" :disabled="confirmSignatureDisabled" @click="confirmSignature">确认签约</button>
       </div>
     </div>
     <mt-popup
@@ -567,6 +571,7 @@ export default {
         orgState: true,
         chooseImg1State: true
       },
+      confirmSignatureDisabled: false,
       btnDisabled: false,
       pickerLastMensesTimeDefault: new Date(), // 末次月经时间默认选中日期为当天
       pickerLastMensesTimeStart: SubtractDay(290), // 末次月经时间起始日期为当天日期前290天
@@ -816,6 +821,7 @@ export default {
 
         // 正常签约并且审核通过直接跳转至首页
         if (parseInt(data.isSign) === 0 && data.state === '1') {
+          this.confirmSignatureDisabled = true
           this.$Indicator.open({
             text: '您签约已通过，快去享受福利吧！',
             spinnerType: 'fading-circle'
@@ -2074,9 +2080,22 @@ export default {
     line-height: 90px;
     text-align: center;
     color: #9aa0a4;
-    border: 1px dotted #9aa0a4;
+    border: 1px dashed #9aa0a4;
     border-radius: 5px;
   }
+  .upload-list ul li > span.idCard-upload-plus {
+    font-size: initial;
+    line-height: initial;
+    width: 120px;
+    height: 120px;
+    color: #333;
+  }
+  .upload-list ul li > span.idCard-upload-plus > h4{
+    margin-top: 1em;
+  }
+  .upload-list ul li > span.idCard-upload-plus > p{
+    font-size: 0.5em;
+  }
   .upload-list ul li > .close-btn {
     position: absolute;
     right: 0;

src/views/user/index.vue

@@ -34,7 +34,7 @@
               </span>
               <span class="line-vertical"></span>
             </div>
-            <div class="item" @click="goToDetail(item.voucherId, item.makeId, item.voucherType)">
+            <div class="item" @click="goToDetail(item.voucherId, item.makeId, item.voucherType, item.state)">
               <CardItem :data="item"></CardItem>
               <span class="status">
                 <img src='../../assets/images/icon-failed.png' v-if="item.state==4" class="full-width"/>
@@ -146,7 +146,15 @@ export default {
         })
       })
     },
-    goToDetail (voucherId, makeId, voucherType) {
+    goToDetail (voucherId, makeId, voucherType, state) {
+      if (state === 0) {
+        this.$Toast({
+          message: '该券还未发放，暂不可查看',
+          position: 'center',
+          duration: 3 * 1000
+        })
+        return
+      }
       this.$router.push({
         path: '/voucherDetail',
         query: {