Merge remote-tracking branch 'origin/develop' into wxl-user-optimize

business/pages/deskcenter/clocklist.js

@@ -487,23 +487,29 @@ Page({
       //解锁打卡 复制 发布
       const mockId = e.currentTarget.dataset.id;
       const mockStatus = e.currentTarget.dataset.status;
-      if (
-        mySystem.system &&
-        mySystem.system.toLowerCase().indexOf("ios") != -1 &&
-        !needIosWarn
-      ) {
+      // if (
+      //   mySystem.system &&
+      //   mySystem.system.toLowerCase().indexOf("ios") != -1 &&
+      //   !needIosWarn
+      // ) {
+      //   if (mockStatus == 2) {
+      //     itemList = ['复制', text, "删除"];
+      //   } else {
+      //     itemList = ["发布", text, "删除"];
+      //   }
+      // } else {
+      //   if (mockStatus == 2) {
+      //     itemList = ['复制', text, "删除", "取消"];
+      //   } else {
+      //     itemList = ["发布", text, "删除", "取消"];
+      //   }
+      // }
+      
         if (mockStatus == 2) {
           itemList = ['复制', text, "删除"];
         } else {
           itemList = ["发布", text, "删除"];
         }
-      } else {
-        if (mockStatus == 2) {
-          itemList = ['复制', text, "删除", "取消"];
-        } else {
-          itemList = ["发布", text, "删除", "取消"];
-        }
-      }
 
       that.getUnlockSubjectList(mockId);
       wx.showActionSheet({

business/pages/themead/landpage.wxml

@@ -50,7 +50,7 @@
         <view class="mask" bindtap="bindModalContact"></view>
         <view class="modal-content">
             <view class="opt-box">
-                <button class="opt-item" open-type="contact" show-message-card="true" send-message-title="请求添加微信" send-message-path="/src/pages/themeindex/landpage?id=1" send-message-img="{{imageRoot}}service/works.png?{{imageVersion}}">
+                <button class="opt-item" open-type="contact" show-message-card="true" send-message-title="请求添加微信" send-message-path="/src/pages/themead/index" send-message-img="{{imageRoot}}service/clock.png?{{imageVersion}}">
                     <image class="icon-opt" src="{{imageRoot}}2c/themeindex/icon_wx.png?{{imageVersion}}"></image>
                     <view class="item-title">添加微信</view>
                 </button>

src/pages/calendarthemeindex/landpage.wxml

@@ -153,7 +153,7 @@
         <view class="mask" bindtap="bindModalContact"></view>
         <view class="modal-content">
             <view class="opt-box">
-                <button class="opt-item" open-type="contact" show-message-card="true" send-message-title="请求添加微信" send-message-path="/src/pages/themeindex/landpage?id=1" send-message-img="{{imageRoot}}service/clock?{{imageVersion}}" wx:if="{{themeSelect.land_content.img}}">
+                <button class="opt-item" open-type="contact" show-message-card="true" send-message-title="请求添加微信" send-message-path="/src/pages/themeindex/landpage?t={{tid}}&type=2" send-message-img="{{imageRoot}}service/clock.png?{{imageVersion}}" wx:if="{{themeSelect.land_content.img}}">
                     <image class="icon-opt" src="{{imageRoot}}2c/themeindex/icon_wx.png?{{imageVersion}}"></image>
                     <view class="item-title">添加微信</view>
                 </button>

src/pages/sharemoretheme/index.wxml

@@ -173,7 +173,7 @@
     <view class="mask" bindtap="bindModalContact"></view>
     <view class="modal-content">
         <view class="opt-box">
-            <button class="opt-item" open-type="contact" show-message-card="true" send-message-title="请求添加微信" send-message-path="/src/pages/sharemoretheme/index" send-message-img="{{imageRoot}}service/clock?{{imageVersion}}" wx:if="{{moreTheme.land_content.img}}">
+            <button class="opt-item" open-type="contact" show-message-card="true" send-message-title="请求添加微信" send-message-path="/src/pages/sharemoretheme/index?t={{tid}}&type=3" send-message-img="{{imageRoot}}service/clock.png?{{imageVersion}}" wx:if="{{moreTheme.land_content.img}}">
                 <image class="icon-opt" src="{{imageRoot}}2c/themeindex/icon_wx.png?{{imageVersion}}"></image>
                 <view class="item-title">添加微信</view>
             </button>

src/pages/themeindex/landpage.wxml

@@ -142,7 +142,7 @@
         <view class="mask" bindtap="bindModalContact"></view>
         <view class="modal-content">
             <view class="opt-box">
-                <button class="opt-item" open-type="contact" show-message-card="true" send-message-title="请求添加微信" send-message-path="/src/pages/themeindex/landpage?id=1" send-message-img="{{imageRoot}}service/clock?{{imageVersion}}" wx:if="{{themeSelect.land_content.img}}">
+                <button class="opt-item" open-type="contact" show-message-card="true" send-message-title="请求添加微信" send-message-path="/src/pages/themeindex/landpage?t={{tid}}&type=1" send-message-img="{{imageRoot}}service/clock.png?{{imageVersion}}" wx:if="{{themeSelect.land_content.img}}">
                     <image class="icon-opt" src="{{imageRoot}}2c/themeindex/icon_wx.png?{{imageVersion}}"></image>
                     <view class="item-title">添加微信</view>
                 </button>