diff --git a/src/views/ebiz/allowance/Detail.vue b/src/views/ebiz/allowance/Detail.vue
index 02b3393c7..8f7a8a871 100644
--- a/src/views/ebiz/allowance/Detail.vue
+++ b/src/views/ebiz/allowance/Detail.vue
@@ -1,149 +1,156 @@
 <template>
-  <div class="orderDetail-container bg-white">
-    <van-collapse v-model="activeNames">
-      <!-- 基本信息 开始 -->
-      <van-collapse-item class="main-title" name="baseInfo">
-        <template slot="title">
-          <span>基本信息</span>
-        </template>
-        <van-cell title="申请人工号" :value="allowanceApplyDTO.agentCode" :border="border" />
-        <van-cell title="申请人姓名" :value="allowanceApplyDTO.name" :border="border" />
-        <van-cell title="申请人证件类型" :value="allowanceApplyDTO.idType | idToText('idType')" :border="border" />
-        <van-cell title="申请人证件号码" :value="allowanceApplyDTO.idNo" :border="border" />
-        <van-cell title="享受人姓名" :value="allowanceEnjoyDTO.name" :border="border" />
-        <select-radio
-          :required="false"
-          :disabled="true"
-          :color="colorButton"
-          :type="typeButton"
-          :radios="relationshipArr"
-          label="享受人角色"
-          name="享受人角色"
-          :value.sync="allowanceEnjoyDTO.relationship"
-        ></select-radio>
-        <van-cell title="享受人证件类型" :value="allowanceEnjoyDTO.idType | idToText('idType')" :border="border" />
-        <van-cell title="享受人证件号码" :value="allowanceEnjoyDTO.idNo" :border="border" />
-        <select-radio
-          :required="false"
-          :disabled="true"
-          :color="colorButton"
-          :type="typeButton"
-          :radios="sexRadio"
-          label="性别"
-          name="性别"
-          :value.sync="allowanceEnjoyDTO.sex"
-        ></select-radio>
-        <van-cell title="出生日期" :value="allowanceEnjoyDTO.birthday" :border="border" />
-      </van-collapse-item>
-      <!-- 基本信息 结束 -->
-      <!-- 账户信息 开始 -->
-      <van-collapse-item title="账户信息" class="main-title" name="accountInfo">
-        <van-cell title="开户银行省市" :value="areaStr" :border="border" />
-        <van-cell title="开户银行" :value="allowanceBankDTO.bankName" :border="border" />
-        <van-cell title="银行卡号" :value="allowanceBankDTO.bankCardNo" :border="border" />
-        <van-cell title="手机号码" :value="allowanceBankDTO.mobile" :border="border" />
-      </van-collapse-item>
-      <!-- 账户信息 结束 -->
-      <!-- 影像资料 开始 -->
-      <!-- imageInfoType 1-居民身份证正面 2-居民身份证反面 3-银行卡正面 5-户口本正面 6-户口本反面 7-出生证正面 12-出生证反面
+  <div class="orderDetail-container bg-white relative">
+    <div v-if="approvalApplyStatus == '4'" style="height: 100vh;">
+      <p class="fs16 gray text-center pt210">申请人已撤销申请</p>
+    </div>
+    <div v-else>
+      <img v-if="approveResult == '0'" class='mt40 w100 h100 absolute top10 right25' style="z-index: 9;" src='@/assets/images/allowance/icon_reject.png' />
+      <img v-else-if="approveResult == '1'" class='mt40 w100 h100 absolute top10 right25' style="z-index: 9;" src='@/assets/images/allowance/icon_pass.png' />
+      <van-collapse v-model="activeNames">
+        <!-- 基本信息 开始 -->
+        <van-collapse-item class="main-title" name="baseInfo">
+          <template slot="title">
+            <span>基本信息</span>
+          </template>
+          <van-cell title="申请人工号" :value="allowanceApplyDTO.agentCode" :border="border" />
+          <van-cell title="申请人姓名" :value="allowanceApplyDTO.name" :border="border" />
+          <van-cell title="申请人证件类型" :value="allowanceApplyDTO.idType | idToText('idType')" :border="border" />
+          <van-cell title="申请人证件号码" :value="allowanceApplyDTO.idNo" :border="border" />
+          <van-cell title="享受人姓名" :value="allowanceEnjoyDTO.name" :border="border" />
+          <select-radio
+            :required="false"
+            :disabled="true"
+            :color="colorButton"
+            :type="typeButton"
+            :radios="relationshipArr"
+            label="享受人角色"
+            name="享受人角色"
+            :value.sync="allowanceEnjoyDTO.relationship"
+          ></select-radio>
+          <van-cell title="享受人证件类型" :value="allowanceEnjoyDTO.idType | idToText('idType')" :border="border" />
+          <van-cell title="享受人证件号码" :value="allowanceEnjoyDTO.idNo" :border="border" />
+          <select-radio
+            :required="false"
+            :disabled="true"
+            :color="colorButton"
+            :type="typeButton"
+            :radios="sexRadio"
+            label="性别"
+            name="性别"
+            :value.sync="allowanceEnjoyDTO.sex"
+          ></select-radio>
+          <van-cell title="出生日期" :value="allowanceEnjoyDTO.birthday" :border="border" />
+        </van-collapse-item>
+        <!-- 基本信息 结束 -->
+        <!-- 账户信息 开始 -->
+        <van-collapse-item title="账户信息" class="main-title" name="accountInfo">
+          <van-cell title="开户银行省市" :value="areaStr" :border="border" />
+          <van-cell title="开户银行" :value="allowanceBankDTO.bankName" :border="border" />
+          <van-cell title="银行卡号" :value="allowanceBankDTO.bankCardNo" :border="border" />
+          <van-cell title="手机号码" :value="allowanceBankDTO.mobile" :border="border" />
+        </van-collapse-item>
+        <!-- 账户信息 结束 -->
+        <!-- 影像资料 开始 -->
+        <!-- imageInfoType 1-居民身份证正面 2-居民身份证反面 3-银行卡正面 5-户口本正面 6-户口本反面 7-出生证正面 12-出生证反面
        8-护照面 9-港澳居民来往内地通行证正面 13-港澳居民来往内地通行证反面 10-台湾居民来往大陆通行证正面 14-台湾居民来往大陆通行证反面
        15-外国人永久居留身份证正面 16-外国人永久居留身份证反面 17-港澳台居民居住证正面 18-港澳台居民居住证反面
       24-健康告知异常类资料 25-申请人执业证  26-享受人无银行卡证明 27-关系证明-->
-      <!-- subBusinessType 0-申请人 1-享受人-->
-      <van-collapse-item class="main-title bg-white" title="影像资料" name="MediaInfo">
-        <div v-for="(item, i) in mediaDTOSList" :key="i">
-          <template v-if="item.subBusinessType == '0'">
-            <div class="fs16 m-img">
-              <p class="pv14">申请人{{ item.imageInfoType | idToText('imageInfoType') }}</p>
-              <img class="mt10" @click="prevImg(imgUrl + item.rgssUrl)" :src="imgUrl + item.rgssUrl" alt="" />
-            </div>
-          </template>
-        </div>
-        <div v-for="(item, i) in mediaUploadDTOLst" :key="'info' + i">
-          <template v-if="item.imageInfoType == '25'">
-            <div class="fs16 m-img">
-              <p class="pv14">申请人执业证</p>
-              <img class="mt10" @click="prevImg(imgUrl + item.rgssUrl)" :src="imgUrl + item.rgssUrl" alt="" />
-            </div>
-          </template>
-        </div>
-        <div v-for="(item, i) in mediaDTOSList" :key="'info1' + i">
-          <template v-if="item.subBusinessType == '1'">
-            <div class="fs16 m-img">
-              <p class="pv14">享受人{{ item.imageInfoType | idToText('imageInfoType') }}</p>
-              <img class="mt10" @click="prevImg(imgUrl + item.rgssUrl)" :src="imgUrl + item.rgssUrl" alt="" />
-            </div>
-          </template>
-        </div>
+        <!-- subBusinessType 0-申请人 1-享受人-->
+        <van-collapse-item class="main-title bg-white" title="影像资料" name="MediaInfo">
+          <div v-for="(item, i) in mediaDTOSList" :key="i">
+            <template v-if="item.subBusinessType == '0'">
+              <div class="fs16 m-img">
+                <p class="pv14">申请人{{ item.imageInfoType | idToText('imageInfoType') }}</p>
+                <img class="mt10" @click="prevImg(imgUrl + item.rgssUrl)" :src="imgUrl + item.rgssUrl" alt="" />
+              </div>
+            </template>
+          </div>
+          <div v-for="(item, i) in mediaUploadDTOLst" :key="'info' + i">
+            <template v-if="item.imageInfoType == '25'">
+              <div class="fs16 m-img">
+                <p class="pv14">申请人执业证</p>
+                <img class="mt10" @click="prevImg(imgUrl + item.rgssUrl)" :src="imgUrl + item.rgssUrl" alt="" />
+              </div>
+            </template>
+          </div>
+          <div v-for="(item, i) in mediaDTOSList" :key="'info1' + i">
+            <template v-if="item.subBusinessType == '1'">
+              <div class="fs16 m-img">
+                <p class="pv14">享受人{{ item.imageInfoType | idToText('imageInfoType') }}</p>
+                <img class="mt10" @click="prevImg(imgUrl + item.rgssUrl)" :src="imgUrl + item.rgssUrl" alt="" />
+              </div>
+            </template>
+          </div>
 
-        <div v-for="(item, i) in mediaUploadDTOLst" :key="'info2' + i">
-          <div class="fs16 m-img" v-if="item.imageInfoType == 3">
-            <p class="pv14">银行卡正面</p>
-            <img class="mt10" @click="prevImg(imgUrl + item.rgssUrl)" :src="imgUrl + item.rgssUrl" alt="" />
+          <div v-for="(item, i) in mediaUploadDTOLst" :key="'info2' + i">
+            <div class="fs16 m-img" v-if="item.imageInfoType == 3">
+              <p class="pv14">银行卡正面</p>
+              <img class="mt10" @click="prevImg(imgUrl + item.rgssUrl)" :src="imgUrl + item.rgssUrl" alt="" />
+            </div>
           </div>
-        </div>
 
-        <div v-if="mediaDTOSOther.length">
-          <p class="pv14 fs16 pl20 pt20">关系证明</p>
-          <p class="red fs10 pl20 pr20">
-            温馨提示：申请人和享受人在同一户口本上需上传户主页、享受人页及本人页；如不在同一户口本上，请上传公安局或居委会开具的关系证明。
-          </p>
-          <div v-for="(item, i) in mediaDTOSOther" :key="'info3' + i" @click="prevImgList(i)" class="fs16 m-img inline-b">
-            <img class="mt10" :src="imgUrl + item.rgssUrl" alt="" />
+          <div v-if="mediaDTOSOther.length">
+            <p class="pv14 fs16 pl20 pt20">关系证明</p>
+            <p class="red fs10 pl20 pr20">
+              温馨提示：申请人和享受人在同一户口本上需上传户主页、享受人页及本人页；如不在同一户口本上，请上传公安局或居委会开具的关系证明。
+            </p>
+            <div v-for="(item, i) in mediaDTOSOther" :key="'info3' + i" @click="prevImgList(i)" class="fs16 m-img inline-b">
+              <img class="mt10" :src="imgUrl + item.rgssUrl" alt="" />
+            </div>
           </div>
-        </div>
-        <div v-if="mediaDTOSNoBank.length">
-          <p class="pv14 fs16 pl20 pt20">享受人无银行卡/手机号证明</p>
-          <div v-for="(item, i) in mediaDTOSNoBank" :key="'info4' + i" class="fs16 m-img">
-            <img class="mt10" @click="prevImg(imgUrl + item.rgssUrl)" :src="imgUrl + item.rgssUrl" alt="" />
+          <div v-if="mediaDTOSNoBank.length">
+            <p class="pv14 fs16 pl20 pt20">享受人无银行卡/手机号证明</p>
+            <div v-for="(item, i) in mediaDTOSNoBank" :key="'info4' + i" class="fs16 m-img">
+              <img class="mt10" @click="prevImg(imgUrl + item.rgssUrl)" :src="imgUrl + item.rgssUrl" alt="" />
+            </div>
           </div>
-        </div>
-      </van-collapse-item>
-      <!-- 影像信息 结束 -->
-      <!-- 签名信息 开始 -->
-      <van-collapse-item class="main-title bg-white" name="signInfo">
-        <template slot="title">
-          <span>签名信息</span>
-        </template>
-        <div class="pb30">
-          <div class="ml15 mt10" v-for="(item, i) in allowanceSignDTOLst" :key="'info5' + i">
-            <span v-if="item.type == 1">申请人签名</span>
-            <span v-else-if="item.type == 2">享受人签名</span>
-            <img v-if="item.signPath" class="w60 h40 ml15 v-middle" :src="imgUrl + item.signPath.replace(/\+/g, '%2B')" alt="" />
+        </van-collapse-item>
+        <!-- 影像信息 结束 -->
+        <!-- 签名信息 开始 -->
+        <van-collapse-item class="main-title bg-white" name="signInfo">
+          <template slot="title">
+            <span>签名信息</span>
+          </template>
+          <div class="pb30">
+            <div class="ml15 mt10" v-for="(item, i) in allowanceSignDTOLst" :key="'info5' + i">
+              <span v-if="item.type == 1">申请人签名</span>
+              <span v-else-if="item.type == 2">享受人签名</span>
+              <img v-if="item.signPath" class="w60 h40 ml15 v-middle" :src="imgUrl + item.signPath.replace(/\+/g, '%2B')" alt="" />
+            </div>
           </div>
-        </div>
-      </van-collapse-item>
-      <!-- 签名信息 结束 -->
-      <!-- 审批结论 开始 -->
-      <van-collapse-item class="main-title bg-white" name="resultInfo" v-if="type == '1' || type == '2'">
-        <template slot="title">
-          <span>审批结论</span>
-        </template>
-        <div class="pb50">
-          <div class="ml15 mt20 mb10">
-            <van-radio-group v-model="approveResult" :disabled="type == '2' || (type == '1' && approvalStatus == '2')">
-              <van-radio class="mb10" name="1" checked-color="#2E4591">通过</van-radio>
-              <van-radio name="0" checked-color="#2E4591">驳回</van-radio>
-            </van-radio-group>
+        </van-collapse-item>
+        <!-- 签名信息 结束 -->
+        <!-- 审批结论 开始 -->
+        <van-collapse-item class="main-title bg-white" name="resultInfo" v-if="type == '1' || type == '2'">
+          <template slot="title">
+            <span>审批结论</span>
+          </template>
+          <div class="pb50">
+            <div class="ml15 mt20 mb10">
+              <van-radio-group v-model="approveResult" :disabled="type == '2' || (type == '1' && approvalStatus == '2')">
+                <van-radio class="mb10" name="1" checked-color="#2E4591">通过</van-radio>
+                <van-radio name="0" checked-color="#2E4591">驳回</van-radio>
+              </van-radio-group>
+            </div>
+            <van-field
+              class="m-textarea"
+              v-if="approveResult == '0'"
+              v-model="approveMsg"
+              rows="2"
+              :disabled="type == '2' || (type == '1' && approvalStatus == '2')"
+              autosize
+              label=""
+              type="textarea"
+              maxlength="200"
+              placeholder="请输入留言"
+              show-word-limit
+            />
           </div>
-          <van-field
-            class="m-textarea"
-            v-if="approveResult == '0'"
-            v-model="approveMsg"
-            rows="2"
-            :disabled="type == '2' || (type == '1' && approvalStatus == '2')"
-            autosize
-            label=""
-            type="textarea"
-            maxlength="200"
-            placeholder="请输入留言"
-            show-word-limit
-          />
-        </div>
-      </van-collapse-item>
-      <!-- 审批结论 结束 -->
-    </van-collapse>
-    <van-button v-if="type == '1' && approvalStatus == '1'" type="danger" class="bottom-btn" @click="nextStep" v-no-more-click="1000">提交审批 </van-button>
+        </van-collapse-item>
+        <!-- 审批结论 结束 -->
+      </van-collapse>
+      <van-button v-if="type == '1' && approvalStatus == '1'" type="danger" class="bottom-btn" @click="nextStep" v-no-more-click="1000">提交审批 </van-button>
+    </div>
   </div>
 </template>
 <script>
@@ -173,6 +180,7 @@ export default {
   },
   data() {
     return {
+      approvalApplyStatus: '', // 申请状态：0未提交, 1审批中 ,2 已同意, 3已驳回, 4已撤销
       approvalStatus: '', //审批状态 (0-不可审批,1-可审批(审批中),2-已审批)
       imgUrl: config.imgDomain + `/returnImageStream?a=b.jpg&imgPath=`,
       approveResult: '1', //审批结果 (0-审批拒绝,1-审批通过)
@@ -251,8 +259,9 @@ export default {
         if (res.result == '0') {
           let allowanceDTO = res.content.allowanceDTO
           if (allowanceDTO.approveNodeDTO) {
-            this.approvalStatus = allowanceDTO.approveNodeDTO.approveStatus
+            this.approvalStatus = allowanceDTO.approveNodeDTO.approveStatus //审批状态
           }
+          this.approvalApplyStatus = allowanceDTO.allowanceApplyDTO.approvalStatus //申请状态
           this.allowanceApplyDTO = allowanceDTO.allowanceApplyDTO
           this.allowanceEnjoyDTO = allowanceDTO.allowanceEnjoyDTO
           this.mediaUploadDTOLst = allowanceDTO.mediaUploadDTOLst
diff --git a/src/views/ebiz/allowance/application/List.vue b/src/views/ebiz/allowance/application/List.vue
index ba7b3182e..f036f77cd 100644
--- a/src/views/ebiz/allowance/application/List.vue
+++ b/src/views/ebiz/allowance/application/List.vue
@@ -180,19 +180,33 @@ export default {
        * SIGN_ALLOWANCE   签名
        */
       let allowanceType = order.infoStatus //上一个节点页面
+      let allowancePageFlag = ''
+      switch (allowanceType) {
+        case 'APPLY_ALLOWANCE': //账户信息
+          allowancePageFlag = '2'
+          break
+        case 'BANK_ALLOWANCE': //影像附件
+          allowancePageFlag = '3'
+          break
+        case 'MEDIA_ALLOWANCE': //签字页面
+          allowancePageFlag = '4'
+          break
+        default:
+          break
+      }
       let url = ''
       switch (allowanceType) {
         case 'APPLY_ALLOWANCE': //账户信息
-          url = '/allowance/application/AccountInfo?allowanceNo=' + order.allowanceNo + '&type=edit&edit=1'
+          url = '/allowance/application/AccountInfo?allowanceNo=' + order.allowanceNo + '&allowancePageFlag='+allowancePageFlag+'&edit=1'
           break
         case 'BANK_ALLOWANCE': //影像附件
-          url = '/allowance/application/AttachmentManagement?allowanceNo=' + order.allowanceNo + '&type=edit&edit=1'
+          url = '/allowance/application/AttachmentManagement?allowanceNo=' + order.allowanceNo + '&allowancePageFlag='+allowancePageFlag+'&edit=1'
           break
         case 'MEDIA_ALLOWANCE': //签字页面
-          url = '/allowance/application/SignatureConfirmation?allowanceNo=' + order.allowanceNo + '&type=edit&edit=1'
+          url = '/allowance/application/SignatureConfirmation?allowanceNo=' + order.allowanceNo + '&allowancePageFlag='+allowancePageFlag+'&edit=1'
           break
         case 'SIGN_ALLOWANCE': //签字页面
-          url = '/allowance/application/SignatureConfirmation?allowanceNo=' + order.allowanceNo + '&type=edit&edit=1'
+          url = '/allowance/application/SignatureConfirmation?allowanceNo=' + order.allowanceNo + '&allowancePageFlag='+allowancePageFlag+'&edit=1'
           break
         default:
           break
@@ -201,13 +215,15 @@ export default {
         flag: 'h5',
         extra: {
           forbidSwipeBack: '1',
+          pullRefresh: '0',  //1:需要下拉刷新 
           url: location.origin + `/#${url}`
         },
         routerInfo: {
           path: url,
           query: {
             allowanceNo: order.allowanceNo,
-            type: 'edit'
+            edit: '1',
+            allowancePageFlag:allowancePageFlag
           }
         }
       })
diff --git a/src/views/ebiz/allowance/application/SignatureConfirmation/SignatureConfirmation.vue b/src/views/ebiz/allowance/application/SignatureConfirmation/SignatureConfirmation.vue
index a1947eaca..10b6e87c9 100644
--- a/src/views/ebiz/allowance/application/SignatureConfirmation/SignatureConfirmation.vue
+++ b/src/views/ebiz/allowance/application/SignatureConfirmation/SignatureConfirmation.vue
@@ -32,6 +32,7 @@
         <p v-if='!isWeixin' class='fw600 border-gb'>
           <span>享受人</span><span class='ml60'>{{ allowanceEnjoyDTO.name }}</span>
         </p>
+<<<<<<< HEAD
         <p v-if='!isWeixin'>点击【签名】按钮，进行享受人签名</p>
         <p class='border-gb'>
           <span v-if='!isWeixin'>享受人：</span>
@@ -42,6 +43,15 @@
           </van-button>
           <img class='w60 h40 v-middle ml10' v-if='item.signPath' :src="imgUrl + item.signPath.replace(/\+/g, '%2B')"
                alt='' /><br />
+=======
+        <p v-if="!isWeixin">点击【签名】按钮，进行享受人签名</p>
+        <p class="border-gb">
+          <span>享受人：</span>
+          <van-button type="danger" color="#2E4591" class="ml5" size="small" @click="signFunc(item.type, item.id)" :disabled="isSure" v-no-more-click="1000">{{
+            item.signStatus == '0' ? '签名' : '已签名'
+          }}</van-button>
+          <img class="w60 h40 v-middle ml10" v-if="item.signPath" :src="imgUrl + item.signPath.replace(/\+/g, '%2B')" alt="" /><br />
+>>>>>>> c7b1b0ed... 【金掌桂父母津贴】申请人已提交申请，且链接未失效，享受人点击了分享链接，要求：提示亲，当前申请已在审批流程中，请耐心等待~
           <!-- 享受人有分享功能 -->
           <van-button
             type='danger'
@@ -563,6 +573,7 @@ export default {
     },
     // 获取订单详情
     getAllowanceDetail() {
+      let that = this
       let data = {
         allowanceNo: this.allowanceNo
       }
@@ -584,7 +595,23 @@ export default {
            * 审批状态
            * 0未提交, 1审批中 ,2 已同意, 3已驳回, 4已撤销
            */
+          // "type" --1:申请人; 2:享受人
+          let isSignPathEnjoy = false
+          that.allowanceSignDTOLst.forEach(function (item) {
+            if (item.type == '2' && item.signPath) {
+              isSignPathEnjoy = true
+            }
+          })
           if (this.isWeixin && this.allowanceApplyDTO.approvalStatus == '1') {
+            Dialog.alert({
+              title: '提示',
+              confirmButtonText: '退出',
+              message: '亲，当前申请已在审批流程中，请耐心等待~'
+            }).then(() => {
+              window.close()
+              WeixinJSBridge.call('closeWindow')
+            })
+          }else if (this.isWeixin && isSignPathEnjoy){
             Dialog.alert({
               title: '提示',
               confirmButtonText: '退出',