Merge branch 'nativehome_tst' of http://code.mayi888.com/chengmo/mayi-mp-shop into nativehome_tst

src/components/basicTool/wo-timeout/index.vue

@@ -55,8 +55,10 @@ export default {
       let month = (new Date().getMonth() + 1) < 10 ? '0'+(new Date().getMonth() + 1):(new Date().getMonth() + 1);
       let day = new Date().getDate() < 10 ?'0'+new Date().getDate():new Date().getDate();
       let today = `${year}/${month}/${day} 00:00:00`;
-      console.log(today,'------------58')
-      let ts = new Date(this.endTime).getTime() - new Date(today).getTime(); //计算剩余的毫秒数
+      // console.log(today,'------------58')
+      // let ts = new Date(this.endTime).getTime() - new Date(today).getTime(); //计算剩余的毫秒数
+      let ts = new Date(this.endTime).getTime() - new Date().getTime(); //计算剩余的毫秒数
+      console.log(ts,'------60----ts')
       ts = parseInt(ts / 1000 / 60 / 60 / 24, 10); //计算剩余的天数
       console.log(ts,'----------------------59')
       return ts;

src/pages/home/index.vue

@@ -278,6 +278,7 @@ export default {
     })
   },
   onLoad(options) {
+    console.log(options,'---------home----options')
     log.info('--------on--------------load')
     //进页面存储需要绑定的信息
     if(options.userId||options.spokesmanRelId) {
@@ -293,10 +294,17 @@ export default {
           if(res.data.code == '200'){
             this.page = res.data.data.pageUri;
             let paramsObj = JSON.parse(res.data.data.scene);
+            if(paramsObj.spokesmanRelId){
+              wx.setStorage({
+                key: "becomeInfo",
+                data: JSON.stringify(paramsObj)
+              });
+            }
             wx.setStorageSync('attractingCustomerChannelId',paramsObj.attractingCustomerChannelId);
             wx.setStorageSync(this.$store.state.mixid+'storeId',paramsObj.storeId);
             wx.setStorageSync(this.$store.state.mixid+'sellerId',paramsObj.sellerId);
             log.info(res.data.data,'getShareSceneRecord')
+            console.log(res.data.data,'----getShareSceneRecord')
             log.info(wx.getStorageSync("openid"))
             log.info(333333)
             if(wx.getStorageSync("openid")) {

src/pages/login/index.vue

@@ -245,9 +245,9 @@ export default {
                 log.info('存入openid失败',e)
               }
               log.info(this.$store.state.mixid,'mixid------230')
-              //冬奥会测试赛（mixid=CL）定制一键登录直接返回不用手机号
+              //冬奥会赛区通行（mixid=CL）定制一键登录直接返回不用手机号
               let isCertified = false;
-              // this.mpApp.globalData.shopInfo.outCode正式环境提审测试赛项目 这个值后台改为1 审核通过改为空
+              // this.mpApp.globalData.shopInfo.outCode正式环境提审赛区通行项目 这个值后台改为1 审核通过改为空
               if(this.$store.state.mixid == 'CL' && this.mpApp.globalData.shopInfo.outCode == '') {
                 isCertified = res.data.data.isCertified == 'true'
                 if(isCertified && res.data.data.sessionId) {

src/pages/wo/improveInformation/index.vue

@@ -20,7 +20,7 @@
           <image
             v-else
             mode="aspectFill"
-            src="http://mayi-newshop.oss-cn-shanghai.aliyuncs.com/public/jpeg/9e733736-3e9d-48d1-82a8-96d21ee014df.jpeg"
+            src="http://cdn.mayi888.com/public/png/4660508a-ee25-4872-a3a8-da10a0fbaab1.png"
             alt=""
           ></image>
         </div>
@@ -51,7 +51,7 @@
       </div>
       <div class="cell flex">
         <div class="label">
-          <p>身份</p>
+          <p>人员类别</p>
         </div>
         <div class="text">
           <p>{{ userInfo.identity }}</p>
@@ -67,7 +67,15 @@
       </div>
       <div class="cell flex">
         <div class="label">
-          <p>就餐权限</p>
+          <p>住宿地点</p>
+        </div>
+        <div class="text">
+          <p>{{userInfo.accommodation}}</p>
+        </div>
+      </div>
+      <div class="cell flex">
+        <div class="label">
+          <p>用餐权限</p>
         </div>
         <div class="text">
           <p>{{ userInfo.diningPlace?'有':'无' }}</p>

src/pages/wo/showPassCheck/index.vue

@@ -10,14 +10,23 @@
     <div class="cont">
       <div class="main flex">
         <div class="title flex">
+          <div class="title-left flex">
+            <div class="img">
+              <image
+                mode="widthFix"
+                src="http://cdn.mayi888.com/public/png/9462ce53-792c-4607-ab7c-1875bed2d3ba.png"
+                alt=""
+              ></image>
+            </div>
+            <p>{{ userInfo.company }}</p>
+          </div>
           <div class="img">
             <image
               mode="widthFix"
-              src="http://mayi-newshop.oss-cn-shanghai.aliyuncs.com/public/png/9462ce53-792c-4607-ab7c-1875bed2d3ba.png"
+              src="http://cdn.mayi888.com/public/png/92ba7c1a-2ab9-4ff9-9ed4-aba4e219ca58.png"
               alt=""
             ></image>
           </div>
-          <p>{{ userInfo.company }}</p>
         </div>
         <div class="userImg">
           <image
@@ -44,7 +53,7 @@
         </div>
         <div class="time" v-if="updateTime">{{ updateTime }}</div>
       </div>
-      <div class="explain">相约北京系列冬季体育赛事张家口赛区组委会</div>
+      <div class="explain">张家口市冬奥会城市运行和环境建设管理指挥部</div>
     </div>
   </div>
 </template>
@@ -71,7 +80,7 @@ export default {
   computed: {},
   onReady() {
     console.log("---onready");
-    wx.setNavigationBarTitle({ title: "测试赛通行证" });
+    wx.setNavigationBarTitle({ title: "赛区通行" });
   },
   onLoad() {
     console.log("---onLoad");
@@ -228,10 +237,15 @@ export default {
     }
     .title {
       align-items: center;
+      justify-content: space-between;
       width: 100%;
+      .title-left{
+        align-items: center;
+      }
       .img {
         width: 30px;
         height: 36px;
+        flex-shrink: 0;
       }
       p {
         margin-left: 10px;

src/pages/wo/vehicleApplication/index.vue

@@ -22,7 +22,7 @@
         <div class="time" v-if="updateTime">{{ updateTime }}</div>
       </div>
       <div class="changeVehicleText" @click="changeVehicle">更换车辆</div>
-      <div class="explain">相约北京系列冬季体育赛事张家口赛区组委会</div>
+      <div class="explain">张家口市冬奥会城市运行和环境建设管理指挥部</div>
     </div>
   </div>
 </template>
@@ -49,7 +49,7 @@ export default {
   computed: {},
   onReady() {
     console.log("---onready");
-    wx.setNavigationBarTitle({ title: "测试赛通行证" });
+    wx.setNavigationBarTitle({ title: "赛区通行" });
   },
   onLoad() {
     console.log("---onLoad");

src/pages/wo/verification/index.vue

@@ -32,7 +32,7 @@
           <div class="val">{{ userInfo.company }}</div>
         </div>
         <div class="cell flex">
-          <div class="label">身份</div>
+          <div class="label">人员类别</div>
           <div class="val">{{ userInfo.identity }}</div>
         </div>
         <div class="cell flex">

src/pages/wo/writeInformation/index.vue

 <template>
-  <!-- 冬奥会测试赛填报资料 -->
+  <!-- 冬奥会赛区通行填报资料 -->
   <div class="writeInformation">
     <div class="info flex">
       <i class="iconfont icon-gantanhao"></i>
@@ -54,7 +54,7 @@
     </div>
     <div class="btm">
       <p class="btm-info">
-        本次操作遵守国家相关法律法规，采集信息仅用于测试赛相关核验查询
+        本次操作遵守国家相关法律法规，采集信息仅用于赛区通行相关核验查询
       </p>
       <div class="btn" :class="{ btn1: onInput }" @click="next">下一步</div>
     </div>