From 01db29aa9e9367701feeaf4846a7b8bdbe502617 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=B3=E5=8D=8E=E7=A5=A5?= <yang.huaxiang@ebiz-fooge.com>
Date: Mon, 24 Feb 2020 12:13:24 +0800
Subject: [PATCH] =?UTF-8?q?GFRS-615=20=E9=97=AE=E5=8D=B7=E8=B0=83=E6=9F=A5?=
 =?UTF-8?q?VUE=E4=BF=AE=E6=94=B93=20--=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A?=
 =?UTF-8?q?=E9=98=B3=E5=8D=8E=E7=A5=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/sharePeople.png    | Bin 1212 -> 905 bytes
 src/assets/images/sharePhone.png     | Bin 382 -> 2635 bytes
 src/views/ebiz/survey/ShareCover.vue |  38 +++++++++++++++++++++------
 src/views/ebiz/survey/SurveyList.vue |  12 ++++++---
 4 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/src/assets/images/sharePeople.png b/src/assets/images/sharePeople.png
index 6c05fb7e9f35bae1d4e36f97361736dfd7c80b74..98a4a2b757623c06134b7754ce6be38c884ebe06 100644
GIT binary patch
literal 905
zcmV;419tq0P)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s7vY8N-00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91C7=TU1ONa40RR91B>(^b0FcN54*&oH^GQTOR9Fe!m_KL~K@`SwNsNUS
zlE%bBI0VJUDu|_ahV-c{1W6^5Dxi(FHiFId7FH=#u!)^wBNjsJ#K5UV8U>Xon2UJ+
zzP+8j+1Z($xjRe_AAC16?|tukZ)WHIa1#@`b-UdcW?qaqGm~So@b)H`G&J-gipJcw
z8mxb@IBYznkzi41S`jC`D3lc_QenLp)0hG(WLK7NH)}~VnM-J3y-0OK#$OrTozK8{
zl0);pQEpWwBet6L0O=2@ML&I+Y}TdKa%B?c!7i9{$h{?j6=2(nAr@s6HBK{{V=31&
zQD-ca<hRv~iu|sU`gjA1enc|IQ0YfOnG}5wxfiuw-Evl_KNYFfUwUWZI6K|YZauc)
zmBLv%DnpWhnTJOEC=DlRkA@r@Lt>{QiQc$(o3;=;zR3Clc*WM9Go~4dQy_Hkgi0pf
zl&u`SVK%vLt_L!S`pY^}YD_wM0Gp`^5njCx)z-jvj<twbHB91B5V9lHj3IA+(ygbB
zMPEhR2j{ZA*4%gFuel`8y29}Z?RXMhSDZuJ&Cn@Z{-&$!U6b(LN^+;)yh$M^*<V}*
z)}KTC+D`-$50Q8^Pkz8--y2v6k@F;70q64Mw~P-Fd!4Vt1If$aH;9=y%M~S@OR>zF
z_);bap;bdl4YiWKAuC((ID9wTLyNn{Q|K6tZ^fGrGL$Qg!HmbKudqAdC#bU@1aE_>
z!72>EMqIb$F&M@kkyQKEwp&ReBB-CxAHckwJm7pAev`L;Czh9bGw&iaN<-@71dvYD
zQkyy(RZ1fy>7+LGEUjjg75ot$&GZqtSL?&va4Tosr#rHb0*heJDwHzqC~xHAF#(Fq
zf_vaA@R|II&&IU=uQ)rN1J}V*umc7$@s+3i<3pVci8J5^XoG)gZNycl{NIM@n!q%;
z4-V2)Kl}Sg-)E<3?wx6H48}A1@Vqq!jo2;R)Jc8BbJF%6@cffbD*COx&rNpJ)B<Sl
fbKy`q^|A05Mzg{923d7000000NkvXXu0mjfd*_L|

literal 1212
zcmV;t1Vj6YP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBU$I!Q!9RA@uhmRm>^Q5eS!A~MQ?9*U@kf*y*9sEF!8upWwxKr6Hx
z)k9mcStMQPN*5x~ilV^K2MfAcme>^{dx(OpTrXR~nz5E?+qya`nXM^b`#*7}*<ojQ
zX3lKmE_`ry&t?9<@Bf`|c1TiE5``k6KLAMNNNDk_dMwNS<Z<I@U0ND#Pfs@-qmq-&
z>aYf2!q~BfMJqwE-()hy0EP`6N@+7^(zf(vLI5Vki<J<>Z&<WQNH}-F7J#`^r&=O@
zXU1}~<s;^RBYlY_0651M2aq{49Y?)qW$FT(05YusSUPXEJpj4cD`W?H-(9E12baiQ
zdX7a|{(crWPv+7Y=VlfM*RGD}m_Q2^y94{yXUc+pxo*+GhjKZ7*WDvTu;w-et4j#;
zfaIYpBXl!c?!b=he{WofB+p}A0T>RjcXft{crgcZ)-01t#Rve_@)A3<Yvcb17&B@F
z6&`U=RY^W84@6&WDR~|hQBCP3O&2iN{QN5Qzb|9!S!q?>qP*SfMIem-l_)y8m3k|$
zQLrk!Y|ic6Lb<ClH33jISfea8oPo1a=S(vTVH}|H+Np>D$Z$o`X-xpksU6|~8<wa3
zKY;v@<;dEvH#c-$+Gv*>XZR`#31w-r6B%~^56a12N>2+82?O990r6s82p~1(+Lty~
zTg6_JSy%2e=Kz23v7B|LUBF)30mh_^q^9S^h9R&Adu<1RfLYU~Q0Kclx*@O@dn^zy
zeh0V+Wb;YU@t6><yXURSJWqhw9Z+TwFC(<YzM4|%cbA3!*xhG=F@D3`;Vqd~Wj;Ot
zct1poK?zV%@sK>8YPxv#1pRz_Gb%vAsl9aJLLOVcaN&F_+z=}vhhsDOe4oOi<I`*E
z30+j~1fV+WpOOD-eb~AyS1#KNFnV+f%cL5Bf0r6w5<+VpzfYPpQ53?w12bk!k1DRA
zwTTeX0C0w2J2ejAbZ#Y=tCG69B$A{6egE!_DDuFEc5=F<h;!H@Nq%;Q+g(jgr^76W
zet@j3mDJc+&mP*{-6aRU`~6?Sgf_H#Y5dFIEHGBOfVJu~aGuxep{y*!Z8kOlYQ4C)
zfC7P*FyTrFjN9A4$wHC+5ibT<V9WuqM!iq@9rJh=o~g66VgsOC!1730Q;X^BY^S!i
zW?Ea<OUWVe2#oO?=Awz`bAEplgRlgEU({IHR}1^n(M7|{11vDsBb=`Z1X`J6Ixl#1
z2T=DoESB|Zflpe0$R&ia5ddC_c(x7~q66&Nv&$4fNpp`3P}tOC3INZx4d7@)uMB{(
z83*DDAW3Z@XS|xiHoXtZ02#GG&2>KCXZ9{pcOsN+Tmf*=T3SA83R~>zlL0W+asX!_
z8G{aB{Hwq303HbkpcId>Rx2Hp4k%kF2hnP!2?Kz(8mWxp4xpnC>*>|;Toe1h&>)9M
aY=A!+!;j~i4ra{&0000<MNUMnLSTY6gcX?p

diff --git a/src/assets/images/sharePhone.png b/src/assets/images/sharePhone.png
index 22f029f311495443cced1c1ccc1c1d562f75a600..8d8c8ab8cb0acfbc17e0ef9be5f504984a063ceb 100644
GIT binary patch
literal 2635
zcmV-R3bgf!P)<h;3K|Lk000e1NJLTq002Ay002A)1^@s7P5bHO00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91JfH&r1ONa40RR91JOBUy0E^%0TmS$GwMj%lRA>d&TYGR7)fxY8$ZHZH
z(2xX3f(7bWMy<82mDERqQd$&AM;&WuQL!DM10AC&GmULWEuCqte_-2br?fM8EgGR(
zrX>_)Dy=*!SX)QyIMksgKqQa{kjNwCdHefq?%ABPcX#h=6Vq?z<b3bP**#~^J-ZRn
zAQFkxqcv-+VHC_Fv>31zDf#bJ^J5gi*q?zv^|od#a$^Q~E6Ja9$KqHqI3aTBoBjJ&
zSFp2S?mGt+I;=n?1xG7yv(OO@VBqXm3hWJ`BEauNTcl_szGAWu5$HxGWh4XzmL|DZ
z&6AA$e4-}MlHfLSmRqH++>^FL4BHO>J-cbMO)4X6#B6RPQbmDPimd^J3Oen?S)t-t
z)sRqL^}Ljl-YY%wj6u{5v&ze4*3K7oyBM6K(Fty$k|+oEXefb8&$O56d}Tx@k)BJo
zNIA6`K#a6?0r4|G-zaB)8#dU5b!%nH179O=fjx4hI2i2Xfj;6fy6};Qb`Y%>EgYlZ
z#(-i2njg$?v$L<WpJi0`n&AM<K?*vbeA@NyjvDEmHT8|r)-Q*;WJVN?;Gl7#Noa&M
zI}3$bt$lCn!gx`mx*H7R%%W+!kGQxo)2XfMP9(Y!nZ|S9{yRI{3GwFn3k{k)0wedM
z&$OuMpU8!a(lq~8on_-%MkN^-@hn>sMMC*`BMX#MsB}W1b_+%HIy6sczF|?MYx5Rc
z9^(&^ur2jRa+I+#CCQ|n5;}X|spwQzH2gLCCu2zaLEWrulkQ<`O*F%0YD8T^!Bg{{
zkX2Yuz`jl}ZGfOg2?suCm1B$VQl!;u_ocy4hEUg9EkTViUZOit(^BUV4^5aLbKW}O
zWG6*4IG3+HSQ$aRyl_8}ZczG0%wDb`d)xxe`Nv-kcF9xgW%i+03|<;UHrJnCILLN&
zGB7CbUwfl1V(^JyUTD+lAPgLagZurQG+lFpM23bel~7ie%z1O4r+V+Zhb8CAd7g45
zP&b$7ilY<<PoI&aRkthB>bZ|BePNS@H(!6N3|+iv$bDwPeifK2&0fRGhiJb376j?>
z(HIeBPA`$m{_@8W1~A^$R$y{5<lJPm5>EzNA6z3nZ@lShQo8Avl6&1}bXhk-P9eh%
ztfWYQo0JMg2iWH#C~stcKmv==(uFSnC<#cBK`k0LkbbZa!r}znC8q+Xi_rMsZboAg
z{ISIyEq{D+1q=@0@MbhVV-p3g`>6w>%t$nnhaR7H$pIYsZlpW{xv>YmB9GN{D#ldm
z(33EBxJWq+;b_d^;XSDyS>Xs8GjI8movma2Pu+$wS)MWMdc`|c670E;SJ1t6n{@u@
zDMhB*bJJnpa8_V2_Uqny4!t2m7cS^52`G4ta%$aN95cmWfBg1)r2lw}&a&~@2X;$F
z!DO3G0oj2Y?GBb->ogwhJndxJbjHMd8&46j_IDiWC!G!oYRqk|l9xUA8xia>(*+cp
z7xQaVIdyJt88qjbtCcw2{!#s|Hk?f;C@|;%gVOI(&%l@M`I8a2=k<RYbehEFo`FL-
zIg(X2)Arx`&2QUy0LUcIz;r%q*B^`+0W2cQU#o9mYL!0oE2V5LB0aCYZqqTyz<~Ho
zMNNNi+`ze?yH@fmM}AGTuBw&x`X@9W!)Wi@@8DO*O>%U>66tvSCoysdqk+?DADA~e
z1Tkbwb&d2j9X0r+n>R}Cr#~f^-ukzkSiZ`TO}?vIiXQ*2!BYfQF6-Eto3l2>^y~fh
z&~A2<?_4THPt-d_0|=Ytx>h?ib^6@)oznij^*YNJcljApiNO2RHNM5yS`$uMdYjC}
zkG2d<w^V>ZX=iVJaILxdHkYe7o_pW@k9=_N3RkV{kI$0w#;s1-OawmZWLoD`NFZq#
zXlsvPfr&I-R~2df#@fhW_lIsi>hyqi#biR8<2Q0lu4|@;A4H{J&|Ro&Z1EuM1(K^P
z1b{#54C?C>)pxm#SCYKNzCpZ%2vU_~Af;~X;k^9E<-=PE8h;7;0e{5BY@^~j4?+Qf
ziy0h^NivaCfwuHPU%~(EO|@7gvjEL_X$g8Xfw8Jm%{L`G1mrKQASPP61H&9ro2>CF
zhvOVH9(;^fU~UOLD~$()v+$^szky%jl#NsRAo5xeecrgHXgrv74HU~qC!da<#dbg2
zAjiH~jrJAke*Q(>{G-B|>!oP!t~tb9VJOdl=3z9?4bb_<UDEdG4_zG=eDzM5_WgCP
zvN2|MBi=k*ZDW&V6pUi4pu}6)6B6B2kE6nQi@&N0vI|DBm0;QerJ(oRz;h#?418?u
zN}0N9MKUI%p<9Kb_tLRdFpA~F{REov+M5bG@T|>w?4`@S@bZ^_C)rnA?j;@z{s4lM
zqUd(DXuSl6Z?ViO`xCR-B@BE6S++I&Q5Va6SsQD#K4@5kem9AD(D&XEX}SBpcxu+C
zTQfIq2=Xv2Zp;J~zQilMEJ0=KN)<ikex#s$@PLM|cmqC!Q|{C4m$6_jRtdx8yQ`(}
zku{$Br+@ZqPuVySRPunS7l~vio6LuJLD1pxf*|M0PfFRAXOeX}7W#cGxD$~IQ;Bxr
zl~?7|!}YGFS>>ftzU_Gl<tDVnb@ed{%+tK3kEH52e_@r(IkZQzW^!|8LVwE%!Ksg&
ze>t#EHp~F2QAb$t_S9^Lt@xGMtlisW>VwN&-L$Ryfi&R|w|nyzSGgCHXLZN%X%SzA
z@avB=zu4%dnhbwCZ)v{QK8u$0Ja$In2dgJmd`p<D7i5+cOW{MSWunIi)jV)Mx%v^$
z4UXU8vscV0zYqOXwbSC6(1th$35$oix}|k>t#9GVSzg8GrQqxLNJd_soLuvrm``Pt
zp0oEj_;#x4^uyR`J#7_CF0OPVx+S_sx_G3oPdXm^v7FoSa=NZO?We7KNDA(|*Ha!9
zST9Y9+Xa(A(L8P(dAmYpK+u1zML3^(55E_X$6+^_(~I%FlKBGA5#Ru>to>fcD42>U
zx&d8{!zfU4;8dHO!3O30pLa7}O1@Eq6x?4Ug>}9!8DD^&v6GA`n9-30565<(aTOnR
z;On@q=YB7Iu1D}b&<prle(K5xWXf{f!kNCmb@)Nw5)`}3%a<!3g@@7p-yrN-OqA(*
zg>?f|TLhYuq(bM9L!1YA)wrr1f#rtc`B7C+Usnfl=P(!JJzZeM>W&bEpRmRIkC7k>
z^76shGxVIs6i4t%G=9XN%!h+ePYCFfzLWYH>oovz=dhPyJU$ZSmX*)+&!SxsZPU?D
tiZ*m|F4|6^=L4GUUub-GUPK=_{15m$*<|;qf*$|?002ovPDHLkV1mkG`hfrd

literal 382
zcmeAS@N?(olHy`uVBq!ia0vp^{2<K11|+SoP4xm&jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCijSl0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP~wlL
zi(`m|fA8egLaqTKZRG;CT?!mc8XZjv9rIiSSonb)g$fo&0oIGo98C+>7~3DW(>s19
z%DDR2zMB7QPWy8xo+yo#YHM7zO6kqb(*`_I*QfS<u<7Sdk5qH4>3QtYwde!OhaYl@
z5}y*TRP}Ak^$ZP_o1@a1@_XO&=8QGVGKJj4-c)^G$+7Bn6xWi>Q{F!tN@JH-&Rfdx
z?A)BMd0h9utMVuwFVthwIKJ&|b)>z!YhcOC8kyst3Ij!M%g*AOn4cDI&1B(zy)<On
z)5F{^E??X5o2#i|T52W3bLJ`E#M@?M&bnf9b~S@hO>2LS&gn%q=QC$5d&}O$%>TQN
Zp)YMu{glS*UxDGk;OXk;vd$@?2>^xtlI;Kh

diff --git a/src/views/ebiz/survey/ShareCover.vue b/src/views/ebiz/survey/ShareCover.vue
index 6395f3ee4..8b5ed8c90 100644
--- a/src/views/ebiz/survey/ShareCover.vue
+++ b/src/views/ebiz/survey/ShareCover.vue
@@ -30,7 +30,7 @@
         <div v-else-if="!item.options">
           <van-col span="24">
             <van-field v-if="item.orderCode == '7'" :label="item.title" maxlength="11" input-align="right" v-model="anwerJson[item.orderCode]" />
-            <van-field v-if="item.orderCode == '6'" :label="item.title" maxlength="4" input-align="right" v-model="anwerJson[item.orderCode]" />
+            <van-field v-if="item.orderCode == '6'" :label="item.title" input-align="right" v-model="anwerJson[item.orderCode]" />
             <van-field v-if="item.orderCode == '8'" :label="item.title" maxlength="3" input-align="right" v-model="anwerJson[item.orderCode]" />
           </van-col>
           <van-col span="24" class="pl10 pr10 bg-white" style="height:2px;"><div style="width: 100%;height: 100%;background-color: #f5f5f5;"></div></van-col>
@@ -53,7 +53,7 @@
         <img src="@/assets/images/sharePeople.png" />
         <div>{{ agentInfo.name }}</div>
       </div>
-      <div class="fix_bottom_sub">
+      <div class="fix_bottom_sub" @click="callPhone">
         <img src="@/assets/images/sharePhone.png" />
         <div>{{ agentInfo.mobile }}</div>
       </div>
@@ -64,6 +64,7 @@
 <script>
 import { Field, CellGroup, Popup, Picker, List, Cell, Row, Col, RadioGroup, Radio, Button } from 'vant'
 import { getSurveyQuestion, saveSurveyAnswer, getSurveyAgentInfo } from '@/api/ebiz/survey/survey'
+import { weixinShare } from '@/assets/js/utils/wxShare.js'
 
 export default {
   components: {
@@ -105,14 +106,20 @@ export default {
           name: null,
           mobile: null
         },
-        userModel: {
-          id: null
-        }
+        agentCode: null,
+        agentName: null
       },
       tableId: null
     }
   },
   created() {
+    // 微信分享设置
+    weixinShare({
+      title: '国富送爱心',
+      imgUrl: this.$assetsUrl + 'images/logo.png',
+      desc: '“共同抗击新冠，国富免费送爱心”'
+    })
+    // 页面初始化
     let tableId = this.getQueryString('code')
     if (!tableId) {
       this.$toast('链接异常，请代理人重新分享')
@@ -169,14 +176,22 @@ export default {
       if (!returnFlag) {
         return
       }
+      // 手机号格式错误校验
       if (!/1\d{10}/.test(that.anwerJson['7'])) {
         that.$toast('手机号格式错误')
+        return
+      }
+      // 年龄格式校验
+      if (!/^[1-9]\d{0,2}$/.test(that.anwerJson['8'])) {
+        that.$toast('年龄格式错误')
+        return
       }
       // 初始化请求数据
-      that.surveyAnswerReqDTO.customerInfo.name = that.anwerJson['7']
-      that.surveyAnswerReqDTO.customerInfo.mobile = that.anwerJson['8']
+      that.surveyAnswerReqDTO.customerInfo.name = that.anwerJson['6']
+      that.surveyAnswerReqDTO.customerInfo.mobile = that.anwerJson['7']
       that.surveyAnswerReqDTO.answer = JSON.stringify(this.anwerJson)
-      that.surveyAnswerReqDTO.userModel.id = that.agentInfo.agentCode
+      that.surveyAnswerReqDTO.agentCode = that.agentInfo.agentCode
+      that.surveyAnswerReqDTO.agentName = that.agentInfo.name
       that.surveyAnswerReqDTO.tableId = that.tableId
       saveSurveyAnswer(that.surveyAnswerReqDTO).then(res => {
         if (res.result == '0') {
@@ -198,6 +213,13 @@ export default {
         }
       }
       return theRequest[name]
+    },
+    callPhone() {
+      let that = this
+      EWebBridge.webCallAppInJs('callSystem', {
+        system: 'tel', //tel: 打电话，sms: 发短信
+        number: that.agentInfo.mobile
+      })
     }
   }
 }
diff --git a/src/views/ebiz/survey/SurveyList.vue b/src/views/ebiz/survey/SurveyList.vue
index 00e9cc330..b304a1a43 100644
--- a/src/views/ebiz/survey/SurveyList.vue
+++ b/src/views/ebiz/survey/SurveyList.vue
@@ -8,6 +8,7 @@
         name="问卷状态"
         placeholder="请选择"
         input-align="right"
+        readonly
         @click="toSelect('0')"
       />
     </van-cell-group>
@@ -86,7 +87,7 @@ export default {
   filters: {
     submitStatusFormat(status) {
       let text
-      switch (status) {
+      switch (status + '') {
         case '1':
           text = '已提交'
           break
@@ -129,6 +130,11 @@ export default {
     },
     // 页面跳转
     getItemDetail(item) {
+      let that = this
+      if (item.isSubmit + '' == '0') {
+        that.$toast('抱歉，系统不支持查看该状态的问卷信息！')
+        return
+      }
       window.localStorage.setItem('surveyTableId', item.tableId)
       this.$jump({
         flag: 'h5',
@@ -180,8 +186,8 @@ export default {
       EWebBridge.webCallAppInJs('bridge', {
         flag: 'share',
         extra: {
-          title: `国富免费送父母健康体检`,
-          content: '“共同抗击新冠，国富免费送父母健康体检”',
+          title: `国富送爱心`,
+          content: '“共同抗击新冠，国富免费送爱心”',
           url: location.origin + '/#/survey/ShareCover?code=' + this.tableId,
           img: this.$assetsUrl + 'images/logo.png'
         }