Merge branch 'dev/v4.8.16_tsz2' of qmx/jy into feature/v4.8.16

src/jfw/modules/app/src/web/templates/big-member/page_client_follow_detail.html

@@ -312,11 +312,11 @@
             <ul class="bid_ul">
               <li class="bid_select" @click="selectBidStatus(1)">
                 <span>是</span>
-                <img v-show="copyBidParams.isWin === 1" src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/images/wxkeyset/right.png?v={{Msg "seo" "version"}}" alt="" />
+                <img v-if="copyBidParams.isWin === 1" src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/images/wxkeyset/right.png?v={{Msg "seo" "version"}}" alt="" />
               </li>
               <li class="bid_select" @click="selectBidStatus(2)">
                 <span>否</span>
-                <img v-show="copyBidParams.isWin === 2" src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/images/wxkeyset/right.png?v={{Msg "seo" "version"}}" alt="" />
+                <img v-if="copyBidParams.isWin === 2" src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/images/wxkeyset/right.png?v={{Msg "seo" "version"}}" alt="" />
               </li>
             </ul>
           </div>

src/jfw/modules/app/src/web/templates/big-member/page_pro_follow_detail.html

@@ -311,11 +311,11 @@
             <ul class="bid_ul">
               <li class="bid_select" @click="selectBidStatus(1)">
                 <span>是</span>
-                <img v-show="copyBidParams.isWin === 1" src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/images/wxkeyset/right.png?v={{Msg "seo" "version"}}" alt="" />
+                <img v-if="copyBidParams.isWin === 1" src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/images/wxkeyset/right.png?v={{Msg "seo" "version"}}" alt="" />
               </li>
               <li class="bid_select" @click="selectBidStatus(2)">
                 <span>否</span>
-                <img v-show="copyBidParams.isWin === 2" src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/images/wxkeyset/right.png?v={{Msg "seo" "version"}}" alt="" />
+                <img v-if="copyBidParams.isWin === 2" src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/images/wxkeyset/right.png?v={{Msg "seo" "version"}}" alt="" />
               </li>
             </ul>
           </div>
@@ -708,6 +708,7 @@
           // 是否中标取消选择
           cancelSelect () {
             this.bidParams.isWin = ''
+            this.copyBidParams.isWin = ''
             this.isBidPopupClose()
           },
           saveStatus: function (str) {
@@ -875,11 +876,19 @@
             this.copyBidParams.isWin = this.copyBidParams.isWin ? parseInt(this.copyBidParams.isWin) : 0
             // this.bidParams.winner = this.prodetail.s_winner
             this.bidParams.sid = this.sid
-            const {channelName, channelPerson, channelPhone, winner, sid, bidStage } = this.bidParams
+            const {channelName, channelPerson, channelPhone, winner, sid, bidStage, isWin } = this.bidParams
+            let tranWin = 0
+            if (isWin === '是') {
+              tranWin = 1
+            } else if (isWin === '否') {
+              tranWin = 2
+            } else {
+              tranWin = 0
+            }
             const ajaxParams = {
               bidType: parseInt(this.copyBidParams.bidType),
               bidStage: bidStage ? bidStage.split('、') : [],
-              isWin: this.copyBidParams.isWin,
+              isWin: tranWin,
               channelName: channelName,
               channelPerson: channelPerson,
               channelPhone: channelPhone,
@@ -945,7 +954,12 @@
             const rsRight = $(e.target).hasClass('r-s-right')
             let weicanbiao = $(e.target).hasClass('weicanbiao')
             if (rsRight) {
-              weicanbiao = $(e.target).find('img').hasClass('weicanbiao')
+              const showElem1 = $($(e.target).find('img')[0])
+              if(showElem1.is(':hidden')) {
+                weicanbiao = false
+              } else {
+                weicanbiao = true
+              }
             }
             const _this = this
             const type = weicanbiao ? 'in' : 'out';

src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -1629,7 +1629,12 @@
       const rsRight = $(e.target).hasClass('r-s-right')
       let weicanbiao = $(e.target).hasClass('weicanbiao')
       if (rsRight) {
-        weicanbiao = $(e.target).find('img').hasClass('weicanbiao')
+        const showElem1 = $($(e.target).find('img')[0])
+        if(showElem1.is(':hidden')) {
+          weicanbiao = false
+        } else {
+          weicanbiao = true
+        }
       }
       const type = weicanbiao ? 'in' : 'out';
       const url = '/jyapi/jybx/core/participate/'+ type + '/info'

src/web/staticres/common-module/big-member/js/page_client_follow_detail.js

@@ -321,6 +321,7 @@ var vNode = {
       // 是否中标取消选择
       cancelSelect () {
         this.bidParams.isWin = ''
+        this.copyBidParams.isWin = ''
         this.isBidPopupClose()
       },
       saveStatus: function (str) {
@@ -488,11 +489,19 @@ var vNode = {
         this.copyBidParams.isWin = this.copyBidParams.isWin ? parseInt(this.copyBidParams.isWin) : 0
             // this.bidParams.winner = this.prodetail.s_winner
         this.bidParams.sid = this.sid
-        const {channelName, channelPerson, channelPhone, winner, sid, bidStage } = this.bidParams
+        const {channelName, channelPerson, channelPhone, winner, sid, bidStage, isWin } = this.bidParams
+        let tranWin = 0
+        if (isWin === '是') {
+          tranWin = 1
+        } else if (isWin === '否') {
+          tranWin = 2
+        } else {
+          tranWin = 0
+        }
         const ajaxParams = {
           bidType: parseInt(this.copyBidParams.bidType),
           bidStage: bidStage ? bidStage.split('、') : [],
-          isWin: this.copyBidParams.isWin,
+          isWin: tranWin,
           channelName: channelName,
           channelPerson: channelPerson,
           channelPhone: channelPhone,
@@ -564,7 +573,12 @@ var vNode = {
         const rsRight = $(e.target).hasClass('r-s-right')
         let weicanbiao = $(e.target).hasClass('weicanbiao')
         if (rsRight) {
-          weicanbiao = $(e.target).find('img').hasClass('weicanbiao')
+          const showElem1 = $($(e.target).find('img')[0])
+          if(showElem1.is(':hidden')) {
+            weicanbiao = false
+          } else {
+            weicanbiao = true
+          }
         }
         const _this = this
         const type = weicanbiao ? 'in' : 'out';

src/web/templates/big-member/wx/page_client_follow_detail.html

@@ -82,7 +82,7 @@
           <div class="r-s-right" @click="setCanBiao($event)">
             <img class="weicanbiao" v-if="cbInfo.canBiaoInfo.showParticipate" src="{{Msg "seo" "cdn"}}/images/canbiao.png?v={{Msg "seo" "version"}}" alt="">
             <span v-if="cbInfo.canBiaoInfo.showParticipate" class="isCB">参标</span>
-            <img style="margin-left: .16rem;" class="canbiao" v-if="cbInfo.canBiaoInfo.showStopParticipate" src="{{Msg "seo" "cdn"}}/images/canbiao-active.png?v={{Msg "seo" "version"}}" alt="">
+            <img style="margin-left: .16rem;" class="canbiao" v-if="cbInfo.canBiaoInfo.showStopParticipate" src="{{Msg "seo" "cdn"}}/images/canbiao-red.png?v={{Msg "seo" "version"}}" alt="">
             <span v-if="cbInfo.canBiaoInfo.showStopParticipate" class="isCB">终止参标</span>
           </div>
         </div>
@@ -290,7 +290,7 @@
           <div class="popupTime-header">
               <div class="header-title">
                 <span>是否中标</span>
-                <span class="cancel_select">取消选择</span>
+                <span @click="cancelSelect()" class="cancel_select">取消选择</span>
               </div>
               <div class="header-close" @click="isBidPopupClose()">
                   <span class="j-icon base-icon icon-delete-gray"></span>
@@ -300,11 +300,11 @@
             <ul class="bid_ul">
               <li class="bid_select" @click="selectBidStatus(1)">
                 <span>是</span>
-                <img v-show="copyBidParams.isWin === 1" src="{{Msg "seo" "cdn"}}/images/wxkeyset/right.png?v={{Msg "seo" "version"}}" alt="" />
+                <img v-if="copyBidParams.isWin === 1" src="{{Msg "seo" "cdn"}}/images/wxkeyset/right.png?v={{Msg "seo" "version"}}" alt="" />
               </li>
               <li class="bid_select" @click="selectBidStatus(2)">
                 <span>否</span>
-                <img v-show="copyBidParams.isWin === 2" src="{{Msg "seo" "cdn"}}/images/wxkeyset/right.png?v={{Msg "seo" "version"}}" alt="" />
+                <img v-if="copyBidParams.isWin === 2" src="{{Msg "seo" "cdn"}}/images/wxkeyset/right.png?v={{Msg "seo" "version"}}" alt="" />
               </li>
             </ul>
           </div>

src/web/templates/big-member/wx/page_pro_follow_detail.html

@@ -86,7 +86,7 @@
             </div>
           </div>
           <div class="r-s-right" @click="setCanBiao($event)">
-            <img class="weicanbiao" v-if="cbInfo.canBiaoInfo.showParticipate" src="{{Msg "seo" "cdn"}}/images/canbiao-active.png?v={{Msg "seo" "version"}}" alt="">
+            <img class="weicanbiao" v-if="cbInfo.canBiaoInfo.showParticipate" src="{{Msg "seo" "cdn"}}/images/canbiao.png?v={{Msg "seo" "version"}}" alt="">
             <span v-if="cbInfo.canBiaoInfo.showParticipate" class="isCB weicanbiao">参标</span>
             <img style="margin-left: .16rem;" class="canbiao" v-if="cbInfo.canBiaoInfo.showStopParticipate" src="{{Msg "seo" "cdn"}}/images/canbiao-red.png?v={{Msg "seo" "version"}}" alt="">
             <span v-if="cbInfo.canBiaoInfo.showStopParticipate" class="isCB canbiao">终止参标</span>
@@ -308,11 +308,11 @@
             <ul class="bid_ul">
               <li class="bid_select" @click="selectBidStatus(1)">
                 <span>是</span>
-                <img v-show="copyBidParams.isWin === 1" src="{{Msg "seo" "cdn"}}/images/wxkeyset/right.png?v={{Msg "seo" "version"}}" alt="" />
+                <img v-if="copyBidParams.isWin === 1" src="{{Msg "seo" "cdn"}}/images/wxkeyset/right.png?v={{Msg "seo" "version"}}" alt="" />
               </li>
               <li class="bid_select" @click="selectBidStatus(2)">
                 <span>否</span>
-                <img v-show="copyBidParams.isWin === 2" src="{{Msg "seo" "cdn"}}/images/wxkeyset/right.png?v={{Msg "seo" "version"}}" alt="" />
+                <img v-if="copyBidParams.isWin === 2" src="{{Msg "seo" "cdn"}}/images/wxkeyset/right.png?v={{Msg "seo" "version"}}" alt="" />
               </li>
             </ul>
           </div>
@@ -704,6 +704,7 @@
           // 是否中标取消选择
           cancelSelect () {
             this.bidParams.isWin = ''
+            this.copyBidParams.isWin = ''
             this.isBidPopupClose()
           },
           // 查看操作记录
@@ -886,11 +887,19 @@
             this.copyBidParams.isWin = this.copyBidParams.isWin ? parseInt(this.copyBidParams.isWin) : 0
             // this.bidParams.winner = this.prodetail.s_winner
             this.bidParams.sid = this.sid
-            const {channelName, channelPerson, channelPhone, winner, sid, bidStage } = this.bidParams
+            const {channelName, channelPerson, channelPhone, winner, sid, bidStage, isWin } = this.bidParams
+            let tranWin = 0
+            if (isWin === '是') {
+              tranWin = 1
+            } else if (isWin === '否') {
+              tranWin = 2
+            } else {
+              tranWin = 0
+            }
             const ajaxParams = {
               bidType: parseInt(this.copyBidParams.bidType),
               bidStage: bidStage ? bidStage.split('、') : [],
-              isWin: this.copyBidParams.isWin,
+              isWin: tranWin,
               channelName: channelName,
               channelPerson: channelPerson,
               channelPhone: channelPhone,
@@ -962,7 +971,12 @@
             const rsRight = $(e.target).hasClass('r-s-right')
             let weicanbiao = $(e.target).hasClass('weicanbiao')
             if (rsRight) {
-              weicanbiao = $(e.target).find('img').hasClass('weicanbiao')
+              const showElem1 = $($(e.target).find('img')[0])
+              if(showElem1.is(':hidden')) {
+                weicanbiao = false
+              } else {
+                weicanbiao = true
+              }
             }
             const _this = this
             const type = weicanbiao ? 'in' : 'out';

src/web/templates/weixin/wxinfocontent_rec.html

@@ -1032,7 +1032,7 @@ body .loading_ p span {
         <span class="cb_name"></span>
       </div>
       <div class="r-s-right">
-        <img style="display: none;" class="weicanbiao" src="{{Msg "seo" "cdn"}}/images/canbiao-active.png?v={{Msg "seo" "version"}}" alt="">
+        <img style="display: none;" class="weicanbiao" src="{{Msg "seo" "cdn"}}/images/canbiao.png?v={{Msg "seo" "version"}}" alt="">
         <span style="display: none;" class="isCB weicanbiao">参标</span>
         <img style="display: none; margin-left: .16rem;" class="canbiao" src="{{Msg "seo" "cdn"}}/images/canbiao-red.png?v={{Msg "seo" "version"}}" alt="">
         <span style="display: none;" class="isCB canbiao">终止参标</span>
@@ -2016,7 +2016,12 @@ function openFileDown (url) {
       const rsRight = $(e.target).hasClass('r-s-right')
       let weicanbiao = $(e.target).hasClass('weicanbiao')
       if (rsRight) {
-        weicanbiao = $(e.target).find('img').hasClass('weicanbiao')
+        const showElem1 = $($(e.target).find('img')[0])
+        if(showElem1.is(':hidden')) {
+          weicanbiao = false
+        } else {
+          weicanbiao = true
+        }
       }
       const type = weicanbiao ? 'in' : 'out';
       const url = '/jyapi/jybx/core/participate/'+ type + '/info'