From e93b80a6da4f4988ef5f54151911b1052754d78f Mon Sep 17 00:00:00 2001
From: gmf <178851839@qq.com>
Date: Thu, 12 Jan 2023 16:42:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/index.wxss              |   3 +-
 pages/service/detail/detail.js     |   2 +-
 pages/service/detail/detail.wxml   | 104 ++++++++++++++---------------
 pages/service/vipCard/vipCard.js   |   6 +-
 pages/service/vipCard/vipCard.wxml |   2 +-
 pages/user/index.js                |  28 ++++----
 pages/user/index.wxml              |   3 +-
 7 files changed, 76 insertions(+), 72 deletions(-)

diff --git a/pages/home/index.wxss b/pages/home/index.wxss
index 3751047..e942ef1 100644
--- a/pages/home/index.wxss
+++ b/pages/home/index.wxss
@@ -1,7 +1,8 @@
 .container {
   font-family: PingFangSC-Regular; 
+  /* -webkit-filter: grayscale(100%); */
 }
 .content{
   width: 100%;
   height:100%;
-}
\ No newline at end of file
+}
diff --git a/pages/service/detail/detail.js b/pages/service/detail/detail.js
index 62d35cc..5174fa9 100644
--- a/pages/service/detail/detail.js
+++ b/pages/service/detail/detail.js
@@ -29,7 +29,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    console.log(options)
+    console.log(options,"1211111")
     this.setData({
       code: options.code,
       app_id: options.app_id,
diff --git a/pages/service/detail/detail.wxml b/pages/service/detail/detail.wxml
index 95ed903..e8ac93e 100644
--- a/pages/service/detail/detail.wxml
+++ b/pages/service/detail/detail.wxml
@@ -1,76 +1,76 @@
 <!--pages/service/detail/detail.wxml-->
 <import src="../../../components/wxParse/wxParse.wxml" />
 <view class="title">
-    <view class="line"></view>
-    服务内容
+  <view class="line"></view>
+  服务内容
 </view>
 <view class="card">
-    <view class="con">
-        <!-- 为高层次人才优先办理人才落户手续，1个工作日内完成网上审核 -->
-        <template is="wxParse" data="{{wxParseData:content.nodes}}" />
-    </view>
+  <view class="con">
+    <!-- 为高层次人才优先办理人才落户手续，1个工作日内完成网上审核 -->
+    <template is="wxParse" data="{{wxParseData:content.nodes}}" />
+  </view>
 </view>
 
 <view class="title">
-    <view class="line"></view>
-    办理部门
+  <view class="line"></view>
+  办理部门
 </view>
 
 <view class="card">
-    <view class="con">
-        <block wx:for="{{departList}}">
-            <view class="tit">{{item.departName}}</view>
-            <view style="margin-bottom:5px">电话：{{item.mobile}}</view>
-        </block>
-    </view>
+  <view class="con">
+    <block wx:for="{{departList}}">
+      <view class="tit">{{item.departName}}</view>
+      <view style="margin-bottom:5px">电话：{{item.mobile}}</view>
+    </block>
+  </view>
 </view>
 
 <block wx:if="{{talentsType != 0 && talentsType != 9}}">
-    <view class="title">
-        <view class="line"></view>
-        预约说明
-    </view>
-    <view class="card">
-        <view class="con">
-            <!-- 为高层次人才优先办理人才落户手续，1个工作日内完成网上审核 -->
-            <template is="wxParse" data="{{wxParseData:explain.nodes}}" />
-        </view>
+  <view class="title">
+    <view class="line"></view>
+    预约说明
+  </view>
+  <view class="card">
+    <view class="con">
+      <!-- 为高层次人才优先办理人才落户手续，1个工作日内完成网上审核 -->
+      <template is="wxParse" data="{{wxParseData:explain.nodes}}" />
     </view>
-    <view class="card" wx:if="{{imgList.length > 0}}">
-        <view class="imgBox">
-            <block wx:for="{{imgList}}">
-                <image src="{{item}}" data-src="{{item}}" data-arr="{{imgList}}" bindtap="previewImage"></image>
-            </block>
-        </view>
+  </view>
+  <view class="card" wx:if="{{imgList.length > 0}}">
+    <view class="imgBox">
+      <block wx:for="{{imgList}}">
+        <image src="{{item}}" data-src="{{item}}" data-arr="{{imgList}}" bindtap="previewImage"></image>
+      </block>
     </view>
+  </view>
 </block>
 <block wx:if="{{talentsType != 0 && talentsType != 9}}">
-    <block wx:if="{{code != 'poaz' && code != 'mrt' && code != 'jgtc'}}">
-        <view class="publish" bindtap="onTap">
-            <!-- <image src="/images/topic/publish.png"></image> -->
-            <block wx:if="{{code == 'xljy' || code == 'qyzp'}}">
-                <text>申请</text>
-            </block>
-            <block wx:else>
-                <text>预约</text>
-            </block>
-        </view>
-    </block>
+  <block wx:if="{{code != 'poaz' && code != 'mrt' && code != 'jgtc' &&code != 'cjkf'&&code != 'qyzp'&&code != 'jdyh'&&code != 'tycg'&&code != 'qyjsl'&&code != 'rclh' && code!='jtcx'}}">
+    <view class="publish" bindtap="onTap">
+      <!-- <image src="/images/topic/publish.png"></image> -->
+      <block wx:if="{{code == 'xljy' || code == 'qyzp'}}">
+        <text>申请</text>
+      </block>
+      <block wx:else>
+        <text>预约</text>
+      </block>
+    </view>
+  </block>
 </block>
 
 
 
 <block wx:if="{{classify}}">
-    <van-popup show="{{ show }}" position="bottom" custom-style="height: 150px;" bind:close="onClose" round="{{false}}">
-        <view class="popup-title">选择服务内容</view>
-        <view class="popup-con">
-            <view class="popup-btn-box">
-                <block wx:for="{{classify}}">
-                    <view class="popup-button" bindtap="settle" data-code="{{item.serverCode}}">{{item.serverName}}
-                    </view>
-                    <!-- <view class="popup-button" bindtap="settle">企业服务补贴</view> -->
-                </block>
-            </view>
-        </view>
-    </van-popup>
+  <van-popup show="{{ show }}" position="bottom" custom-style="height: 150px;" bind:close="onClose" round="{{false}}">
+    <view class="popup-title">选择服务内容</view>
+    <view class="popup-con">
+      <view class="popup-btn-box">
+        <block wx:for="{{classify}}">
+          <view class="popup-button" bindtap="settle" data-code="{{item.serverCode}}">{{item.serverName}}
+          </view>
+          <!-- <view class="popup-button" bindtap="settle">企业服务补贴</view> -->
+        </block>
+      </view>
+    </view>
+  </van-popup>
 </block>
\ No newline at end of file
diff --git a/pages/service/vipCard/vipCard.js b/pages/service/vipCard/vipCard.js
index 73194cc..155c728 100644
--- a/pages/service/vipCard/vipCard.js
+++ b/pages/service/vipCard/vipCard.js
@@ -8,7 +8,8 @@ Page({
      */
     data: {
         detail:{},
-        card:"../../../images/card.png"
+        card:"../../../images/card.png",
+        idCard:''
     },
 
     /**
@@ -23,7 +24,8 @@ Page({
                 })
             }else{
                 this.setData({
-                    detail:res.result
+                    detail:res.result,
+                    idCard:res.result.idCard.replace(/^(.{6})(?:\d+)(.{4})$/,"$1****$2")
                 })
             }
             
diff --git a/pages/service/vipCard/vipCard.wxml b/pages/service/vipCard/vipCard.wxml
index e8301f5..307d3b7 100644
--- a/pages/service/vipCard/vipCard.wxml
+++ b/pages/service/vipCard/vipCard.wxml
@@ -5,7 +5,7 @@
     <view class="title">{{detail.cardName}}</view>
     <view class="name">{{detail.name}}</view>
     <view class="type">{{detail.talentsType}}</view>
-    <view class="number">NO: {{detail.idCard}}</view>
+    <view class="number">NO: {{idCard}}</view>
 </view>
 
 <view class="explain-tit">权益说明</view>
diff --git a/pages/user/index.js b/pages/user/index.js
index 7921a13..0ec6c10 100644
--- a/pages/user/index.js
+++ b/pages/user/index.js
@@ -435,18 +435,18 @@ Page({
     })
     return;
   },
-  goTraffic(){
-    wx.navigateToMiniProgram({
-      appId: 'wx0773fc2238f4ca70',
-      path: '',
-      envVersion: 'release', // 打开正式版
-      success(res) {
-        // 打开成功
-        console.log('打开成功')
-      },
-      fail: function (err) {
-        console.log(err);
-      }
-    })
-  }
+  // goTraffic(){
+  //   wx.navigateToMiniProgram({
+  //     appId: 'wx0773fc2238f4ca70',
+  //     path: '',
+  //     envVersion: 'release', // 打开正式版
+  //     success(res) {
+  //       // 打开成功
+  //       console.log('打开成功')
+  //     },
+  //     fail: function (err) {
+  //       console.log(err);
+  //     }
+  //   })
+  // }
 })
\ No newline at end of file
diff --git a/pages/user/index.wxml b/pages/user/index.wxml
index c054ca0..0ee76f8 100644
--- a/pages/user/index.wxml
+++ b/pages/user/index.wxml
@@ -67,7 +67,8 @@
               </van-grid-item>
             </block>
             <block wx:elif="{{it.pic && it.server_code=='jtcx'}}">
-              <van-grid-item use-slot bindtap="goTraffic">
+              <!-- bindtap="goTraffic" -->
+              <van-grid-item use-slot url="/pages/service/detail/detail?code={{it.server_code}}&pic={{it.pic}}" >
                 <view class="circular">
                   <image src="../../images/icon/{{it.server_code}}.png" mode="aspectFit" class="icon"></image>
                 </view>