Merge branch 'lvtz_home' of git.server:wangxuelai/wechatapp.shangjiadao.com into lvtz_home

components/sjdbottombar/index.js

@@ -46,9 +46,13 @@ Component({
       type: String,
       value: '/ucenter/index'
     },
-    
+    newpath: {//来源路径
+      type: String,
+      value: ''
+    },
   },
   ready () {
+    console.log(this.data.newpath, 'this')
   },
   methods: {
     goUserBusiness () {
@@ -96,9 +100,14 @@ Component({
       })
     },
     bindContactDialog (){
+      this.triggerEvent('opendia');
       this.setData({
         showModal: !this.data.showModal
       })
+    },
+    godialog () {
+      console.log(this.data.path, 'dddd');
+      this.triggerEvent('godialog');
     }
   }
 })
\ No newline at end of file

components/sjdbottombar/index.wxml

@@ -10,6 +10,6 @@
         <image class="icon-close" src="{{imageRoot}}2b/common/closeicon.png?{{imageVersion}}" bindtap="bindContactDialog"></image>
         <view class="modal-title">进入客服消息，点击右下角，获取公众号二维码。</view>
         <image class="pic" src="{{imageRoot}}service/service_enter.png?{{imageVersion}}"></image>
-        <button class="btn-open" open-type='contact' keyword="{{keyword}}" show-message-card="true" send-message-title="{{sharetitle}}" send-message-path="{{path}}" send-message-img="{{imageRoot}}{{coverimg}}?{{imageVersion}}">点击获取</button>
+        <button class="btn-open" bindtap="godialog" open-type='contact' keyword="{{keyword}}" show-message-card="true" send-message-title="{{sharetitle}}" send-message-path="{{path}}" send-message-img="{{imageRoot}}{{coverimg}}?{{imageVersion}}">点击获取</button>
     </view>
 </view>
\ No newline at end of file

constants/activityconfig.js

@@ -14,9 +14,10 @@ export default {
             posterbg: 'https://cdn.img.shangjiadao.cn/qingxiao/daka/images/2c/dailyposter2/bg825.png'
             
         },
-        {
-            sid: 807,
-            posterbg:'https://cdn.img.shangjiadao.cn/qingxiao/daka/images/2c/dailyposter2/bg807.png'
-        },
+        // 20200210 去掉该校区
+        // {
+        //     sid: 807,
+        //     posterbg:'https://cdn.img.shangjiadao.cn/qingxiao/daka/images/2c/dailyposter2/bg807.png'
+        // },
     ]
 }
\ No newline at end of file

src/pages/sharemoretheme/index.wxml

 <wxs src="./../../../filter/index.wxs" module="filter" />
-<view class="container">
+<view class="container {{infogetShow? 'containerDisabledScroll': ''}}">
   <btn-drag bind:btnDragEvent='goqrcode' tobottomDis='300' width='60' height="60" catchtouchmove="ture">
     <view class="sharebtn" slot="dragcontent">
       <image src="{{imageRoot}}2c/sharemoretheme/sharer.png" class="sharericon" alt="Image" />

src/pages/sharemoretheme/index.wxss

+page{
+    height: 100%;
+}
 .sharemoretheme-box{
     min-height: 100vh;
     padding-bottom: 200rpx;

src/pages/websiteindex/onlineclassroomindex.js

@@ -208,6 +208,9 @@ Page({
         try {
           content = JSON.parse(data.intro) || [];
           data.intro = content;
+          if (data.share_switch == 2) {
+            wx.hideShareMenu();
+          }
         } catch (error) {
         }
         Object.assign(data, {

src/pages/websiteindex/onlineclassroomplay.js

@@ -137,6 +137,9 @@ Page({
         }).then((res)=>{
           const {code, data, datetime} = res;
           if(code == 200){
+            if (data.share_switch == 2) {
+              wx.hideShareMenu();
+            }
           }else{
             wx.showModal({
               title: '提示',
@@ -274,6 +277,9 @@ Page({
           content = JSON.parse(data.intro) || [];
           data.content =  data.content ? JSON.parse(data.content) : ''
           data.intro = content;
+          if (data.share_switch == 2) {
+            wx.hideShareMenu();
+          }
         } catch (error) {
         }
         Object.assign(data, {

ucenter/index.js

@@ -53,6 +53,7 @@ Page({
     schoolTotal: 0,
     cSchoolList: [],
     cSchoolTotal: 0,
+    sendpath: '/ucenter/index',
     waitJob: {},
     noticecount: { 1: 0, 2: 0, 3: 0, 4: 0 },
     sid: 0,
@@ -214,8 +215,10 @@ Page({
             class_times: data.class_times,
             clock_days: data.clock_days,
             integral_balance: data.integral_balance,
-          }
+          },
+          sendpath: `/ucenter/index?id=${data.student_id}`
         })
+        // console.log(this.data.userInfo, 'userInfo')
         this.noticecountGet();
         this.viewlistGet();//获取看客列表5条数据
         this.getIdentitylist();
@@ -585,6 +588,38 @@ Page({
       })
     })
   },
+  opendia () { // 点击我也要用小程序
+    const {
+      originParams,
+      originScene,
+    } = app.globalData;
+    behaviorLog({
+      source_path: `ucenter/index:useqxt`,
+      source_id: this.data.sid,
+      source_type_model: 1,
+      scene: originScene || '',
+      param: JSON.stringify({
+        from: originParams,
+        source: this.data.options,
+      })
+    })
+  },
+  godialog () { // 点击进入客服消息
+    const {
+      originParams,
+      originScene,
+    } = app.globalData;
+    behaviorLog({
+      source_path: `ucenter/index:gogetqxt`,
+      source_id: this.data.sid,
+      source_type_model: 1,
+      scene: originScene || '',
+      param: JSON.stringify({
+        from: originParams,
+        source: this.data.options,
+      })
+    })
+  },
   true(){}
   
 })
\ No newline at end of file

ucenter/index.wxml

@@ -181,6 +181,10 @@
         pagetitle="我也要用小程序 > "
         pagetitletip="立即使用"
         sharetitle="校区管理，打卡作业招生" 
+        bind:opendia="opendia"
+        bind:godialog="godialog"
+        newpath="/ucenter/index"
+        path="{{sendpath}}"
         coverimg="service/tosue.png"
     ></sjdbottombar>
     <view class="modal modalUsers {{modelUsersAnimate? 'hide': ''}}" hidden="{{!modalUsers}}">