Merge branch 'develop' of git.server:wangxuelai/wechatapp.shangjiadao.com into sj-dev-v10

business/pages/commenteditor/imagecomment.js

@@ -493,7 +493,7 @@ Page({
     wxAuthorize('scope.record').then(() => {
       if (this.data.audioStatus.playStatus == 'no') {
         this.recorderManager.start({
-          duration: 300000,
+          duration: 600000,
           sampleRate: 8000,
           numberOfChannels: 1,
           encodeBitRate: 20000,
@@ -518,7 +518,19 @@ Page({
           this.setData({
             duration: duration
           })
+
+          if(this.data.duration>=540){
+            duration = 540;
+            this.setData({
+              ispainting: false,
+              colorModal: false,
+            })
+            this.stop();
+            return
+          }
         }, 1000);
+        
+
         this.setData({
           voiceInterval
         })
@@ -563,6 +575,15 @@ Page({
         this.setData({
           duration: duration
         })
+        if(this.data.duration>=540){
+          duration = 540;
+          this.setData({
+            ispainting: false,
+            colorModal: false,
+          })
+          this.stop();
+          return
+        }
       }, 1000);
       this.setData({
         voiceInterval

components/sjdbottombar/index.js

@@ -8,6 +8,7 @@ import {
   bTokenExchange,
   getMember
 } from '../../service/common.js';
+// import { stringify } from 'querystring';
 var app = getApp();
 Component({
   data: {
@@ -16,10 +17,34 @@ Component({
     imageVersion: app.globalData.imageVersion,
   },
   properties: {
-    address: { // 圈子id
-      type: Object,
-      value: {}
+    showcontact: {
+      type: Boolean,
+      value: false
     },
+    pagetitle: { //页面入口标题
+      type: String,
+      value: '我也要使用小程序'
+    },
+    pagetitletip: {
+      type: String,
+      value: '立即使用'
+    },
+    sharetitle: {//卡片标题
+      type: String,
+      value: '我也要'
+    },
+    keyword: {//用来判断类型
+      type: String,
+      value: ''
+    },
+    coverimg: {//封面背景图片
+      type: String,
+      value: 'service/task.png'
+    },
+    path: {//来源路径
+      type: String,
+      value: '/ucenter/index'
+    }
   },
   ready () {
   },

components/sjdbottombar/index.wxml

 <view class="tech-support-box">
-    <image class="logo" src="{{imageRoot}}common/logo.png?{{imageVersion}}"></image>
-    <view class="text" wx:if="{{!hasmore}}">提供技术支持</view>
-    <view class="text makeone" bindtap="goUserBusiness">我也要使用小程序</view>
+    <!-- <image class="logo" src="{{imageRoot}}common/logo.png?{{imageVersion}}"></image> -->
+    <!-- <view class="text" wx:if="{{!hasmore}}">提供技术支持</view> -->
+    <!-- <view class="text makeone" bindtap="goUserBusiness">我也要使用小程序</view> -->
+    <button class="makeone" wx:if="{{showcontact}}" open-type='contact' keyword="{{keyword}}" show-message-card="true" send-message-title="{{sharetitle}}" send-message-path="{{path}}" send-message-img="{{imageRoot}}{{coverimg}}?{{imageVersion}}">
+        {{pagetitle}}<text class="tip">{{pagetitletip}}</text>
+    </button>
 </view>
\ No newline at end of file

components/sjdbottombar/index.wxss

@@ -30,5 +30,19 @@
   display: none;
 }
 .makeone{
-  color: #FF9F00;
+  color: #9c9c9c;
+  margin: 0;
+  background: rgba(222, 222, 222,.5);
+  line-height: 40rpx;
+  border-radius: 20rpx;
+  font-size: 22rpx;
+  padding: 0 14rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.makeone .tip{
+  color: #ffa800;
+  font-size: 22rpx;
+  padding-left: 5rpx;
 }
\ No newline at end of file

src/pages/allsubjects/index.json

@@ -4,7 +4,6 @@
   "enablePullDownRefresh": true,
   "usingComponents": {
     "list-loading": "../../../components/listloading",
-    "sjdbottombar":"../../../components/sjdbottombar",
     "guidecollection": "../../../components/guidecollection"
   }
 }
\ No newline at end of file

src/pages/allsubjects/index.wxml

@@ -49,7 +49,6 @@
         </view>
       </view>
     </view>
-    <sjdbottombar></sjdbottombar>
   </view>
 </view>
   <view class=""      >

src/pages/calendarthemeindex/index.wxml

@@ -359,7 +359,14 @@
             </view>
         </btn-drag>
     </view>
-    <sjdbottombar></sjdbottombar>
+    <sjdbottombar 
+        showcontact="{{true}}" 
+        keyword="theme" 
+        pagetitle="我是机构，我也要用打卡 > > > " 
+        pagetitletip ="立即使用"
+        sharetitle="我也要用打卡" 
+        coverimg="service/useclock.png"
+    ></sjdbottombar>
 
     <go-top wx:if="{{backTopValue}}"></go-top>
     <view class=""  data-editor="commenteditor">

src/pages/clockdetail/index.wxml

@@ -47,7 +47,15 @@
         wx:if="{{!hasData}}"
     >
     </empty-content>
-    <sjdbottombar></sjdbottombar>
+    
+    <sjdbottombar 
+        showcontact="{{true}}" 
+        keyword="themedetail" 
+        pagetitle="如何用作业招生 > > > " 
+        pagetitletip ="5S学会"
+        sharetitle="我也要用学生作业招生拓客" 
+        coverimg="service/task.png"
+    ></sjdbottombar>
     <!-- <prize-get
         wx-if="{{adGetShow}}"
         bind:closeAdModal="closeAdModal"

src/pages/clockdetail/newindex.wxml

@@ -174,7 +174,14 @@
         </view>
     </view>
       
-    <sjdbottombar></sjdbottombar>
+    <sjdbottombar 
+        showcontact="{{true}}" 
+        keyword="themedetail" 
+        pagetitle="如何用作业招生 > > > "
+        pagetitletip ="5S学会"
+        sharetitle="我也要用学生作业招生拓客" 
+        coverimg="service/task.png"
+    ></sjdbottombar>
     <guidecollection/>             
 </view>
 

src/pages/clockeditor/index.json

@@ -5,7 +5,6 @@
     "sjd-media-show": "../../../components/sjdmediashow",
     "sound-recording": "../../../components/soundrecording",
     "activity-bar":"../../../components/activitybar",
-    "sjdbottombar":"../../../components/sjdbottombar",
     "guidecollection": "../../../components/guidecollection"
   }
 }
\ No newline at end of file

src/pages/clockeditor/index.wxml

@@ -207,7 +207,6 @@
             </view>
         </view>
         <view class="red-text"      wx:if="{{pagefrom!='morethemeindex'}}">一个主题只能打卡一次喔！</view>
-        <sjdbottombar></sjdbottombar>
         <sound-recording
             show="{{audioStatus.show}}"
             bind:addVoice="addVoice"

src/pages/exchangebusiness/index.json

 {
   "usingComponents": {
-    "sjdbottombar":"../../../components/sjdbottombar",
     "guidecollection": "../../../components/guidecollection"
   },
   "navigationBarTitleText": "切换校区"

src/pages/exchangebusiness/index.wxml

@@ -9,6 +9,5 @@
       <view class="item">{{item.title}}</view>
     </view>
   </view>
-  <sjdbottombar></sjdbottombar>
   <guidecollection/>
 </view>
\ No newline at end of file

src/pages/growthrecord/index.wxml

@@ -171,7 +171,14 @@
                     </view>
                 </block>
                 <list-loading loading="{{listLoading}}"></list-loading>
-                <sjdbottombar wx:if="{{!hasmore}}"></sjdbottombar>
+                <sjdbottombar 
+                    showcontact="{{true}}" 
+                    keyword="growth" 
+                    pagetitle="我是机构，我也要沉淀学员作品 > > >" 
+                    pagetitletip ="立即使用"
+                    sharetitle="我要沉淀学员作品" 
+                    coverimg="service/works.png"
+                ></sjdbottombar>
             </view>
             <view class="empty-content-box" wx:if="{{emptyPage}}">
                 <empty-content text="暂无数据~" emptyimg="common/empty/empty_c_sraech.png" width="263" height="219"></empty-content>
@@ -219,7 +226,14 @@
                     <empty-content text="暂无课堂小评，快去通知老师点评吧～<" emptyimg="common/empty/empty_c_sraech.png" width="263" height="219"></empty-content>
                 </view>
                 <list-loading loading="{{galleryLoading}}"></list-loading>
-                <sjdbottombar></sjdbottombar>
+                <sjdbottombar 
+                    showcontact="{{true}}" 
+                    keyword="growth" 
+                    pagetitle="我是机构，我也要沉淀学员作品 > > >" 
+                    pagetitletip ="立即使用"
+                    sharetitle="我要沉淀学员作品" 
+                    coverimg="service/works.png"
+                ></sjdbottombar>
             </view>
         </view>
         <remark-editor

src/pages/integralfile/exchangerecord.json

@@ -3,7 +3,6 @@
     "enablePullDownRefresh": true,
     "usingComponents": {
         "list-loading": "../../../components/listloading",
-        "sjdbottombar":"../../../components/sjdbottombar",
         "empty-content": "../../../components/emptycontent",
         "guidecollection": "../../../components/guidecollection"
     }

src/pages/integralfile/index.json

@@ -3,7 +3,6 @@
   "navigationBarTitleText": "积分",
   "usingComponents": {
     "empty-content": "../../../components/emptycontent",
-    "sjdbottombar":"../../../components/sjdbottombar",
     "guidecollection": "../../../components/guidecollection"
   }
 }
\ No newline at end of file

src/pages/integralfile/index.wxml

@@ -235,6 +235,5 @@
   <view class="empty-content-box" wx:else>
     <empty-content text="还没有积分任务哦~" emptyimg="common/empty/empty_no.png" width="263" height="219"></empty-content>
   </view>
-  <sjdbottombar></sjdbottombar>
   <guidecollection/>
 </view>
\ No newline at end of file

src/pages/integralfile/inout.json

@@ -2,7 +2,6 @@
   "navigationBarTitleText": "积分明细",
   "usingComponents": {
     "list-loading": "../../../components/listloading",
-    "sjdbottombar":"../../../components/sjdbottombar",
     "empty-content": "../../../components/emptycontent",
     "guidecollection": "../../../components/guidecollection"
   }

src/pages/integralfile/inout.wxml

@@ -64,6 +64,5 @@
             <list-loading loading="{{listLoading}}"></list-loading>
         </view>
     </view>
-    <sjdbottombar></sjdbottombar>
     <guidecollection/>
 </view>
\ No newline at end of file

src/pages/integralfile/rule.json

@@ -2,7 +2,6 @@
     "navigationBarTitleText": "积分规则",
     "usingComponents": {
         "empty-content": "../../../components/emptycontent",
-        "sjdbottombar":"../../../components/sjdbottombar",
         "guidecollection": "../../../components/guidecollection"
     }
 }
\ No newline at end of file

src/pages/integralfile/rule.wxml

@@ -124,6 +124,5 @@
     <view class="empty-content-box" wx:else>
         <empty-content text="暂未设置积分" emptyimg="common/empty/empty_no.png" ></empty-content>
     </view>
-    <sjdbottombar></sjdbottombar>
     <guidecollection/>
 </view>

src/pages/mall/index.json

 {
   "usingComponents": {
-    "sjdbottombar":"../../../components/sjdbottombar",
     "empty-content": "../../../components/emptycontent",
     "guidecollection": "../../../components/guidecollection"
   },

src/pages/mall/index.wxml

@@ -73,6 +73,5 @@
   <view class="empty-content-box" wx:if="{{emptyPage}}">
     <empty-content text="老师还没设置奖品、卡券哦~" emptyimg="common/empty/empty_no.png" width="263" height="219"></empty-content>
   </view>
-  <sjdbottombar></sjdbottombar>
   <guidecollection/>
 </view>
\ No newline at end of file

src/pages/morethemeindex/index.wxml

@@ -274,7 +274,14 @@
                 <empty-content text="打卡后才能看到其他同学的打卡内容喔~" emptyimg="common/empty/empty_c_sraech.png" width="263" height="219"></empty-content>
             </view>
         </view>
-        <sjdbottombar></sjdbottombar>
+        <sjdbottombar 
+            showcontact="{{true}}" 
+            keyword="theme" 
+            pagetitle="我是机构，我也要用打卡 > > > " 
+            pagetitletip ="立即使用"
+            sharetitle="我也要用打卡"
+            coverimg="service/useclock.png"
+        ></sjdbottombar>
         <psd-editor bind:closepsddia="closepsddia" circleid="{{id}}" wx:if="{{showPsdDia}}" bind:checkPsd="checkPsd">
         </psd-editor>
         <remark-editor wx:if="{{showNameSetDia}}" remark="{{remark}}" bind:closenamedia="closenamedia" circleid="{{id}}"

src/pages/myachievement/index.json

@@ -5,7 +5,6 @@
     "poster-box": "../../../components/posterbox",
     "canvasdrawer": "/components/canvasdrawer/canvasdrawer",
     "activity-bar":"../../../components/activitybar",
-    "sjdbottombar":"../../../components/sjdbottombar",
     "guidecollection": "../../../components/guidecollection"
   }
 }
\ No newline at end of file

src/pages/myachievement/index.wxml

@@ -64,7 +64,6 @@
             </view>
               
         </view>
-        <sjdbottombar></sjdbottombar>
     </view>
     <canvasdrawer painting="{{painting}}" bind:getImage="eventGetImage"/>
     <poster-box wx:if="{{posterBoxShow}}" canvasimagepath="{{canvasImagePath}}" bind:closeposter="closeposter">

src/pages/mycalendart/index.wxml

@@ -87,7 +87,14 @@
                 这一天是休息日，不需要打卡哦~
             </view>
         </view>
-        <sjdbottombar></sjdbottombar>
+        <sjdbottombar 
+            showcontact="{{true}}" 
+            keyword="theme" 
+            pagetitle="我是机构，我也要用打卡 > > > " 
+            pagetitletip ="立即使用"
+            sharetitle="我也要用打卡" 
+            coverimg="service/useclock.png"
+        ></sjdbottombar>
         <psd-editor bind:closepsddia="closepsddia" circleid="{{id}}" wx:if="{{showPsdDia}}" bind:checkPsd="checkPsd">
         </psd-editor>
         <remark-editor wx:if="{{showNameSetDia}}" remark="{{remark}}" bind:closenamedia="closenamedia" circleid="{{id}}"

src/pages/myinfluence/index.json

@@ -2,7 +2,6 @@
   "usingComponents": {
     "list-loading": "../../../components/listloading",
     "activity-bar":"../../../components/activitybar",
-    "sjdbottombar":"../../../components/sjdbottombar",
     "guidecollection": "../../../components/guidecollection"
   },
   "navigationBarTitleText": "我的影响力",

src/pages/myinfluence/influencelist.json

@@ -3,7 +3,6 @@
   "usingComponents": {
     "list-loading": "../../../components/listloading",
     "activity-bar": "../../../components/activitybar",
-    "sjdbottombar": "../../../components/sjdbottombar",
     "guidecollection": "../../../components/guidecollection",
     "layout": "../../../components/layout"
   },

src/pages/mylikes/index.json

@@ -2,7 +2,6 @@
   "usingComponents": {
     "list-loading": "../../../components/listloading",
     "activity-bar":"../../../components/activitybar",
-    "sjdbottombar":"../../../components/sjdbottombar",
     "guidecollection": "../../../components/guidecollection"
   },
   "navigationBarTitleText": "我的点赞",

src/pages/mylikes/index.wxml

@@ -38,6 +38,5 @@
     >
     </activity-bar>
   </view>
-  <sjdbottombar></sjdbottombar>
   <guidecollection/>
 </view>
\ No newline at end of file

src/pages/mynews/index.json

 {
   "usingComponents": {
     "activity-bar":"../../../components/activitybar",
-    "sjdbottombar":"../../../components/sjdbottombar",
     "empty-content": "../../../components/emptycontent",
     "guidecollection": "../../../components/guidecollection"
   },

src/pages/mynews/index.wxml

@@ -71,7 +71,6 @@
         </view>
       </view>
     </view>
-    <sjdbottombar></sjdbottombar>
   </view>
   <view class="" wx:if="{{sid == activtySchoolInfo.sid}}">
     <activity-bar

src/pages/mytask/index.json

@@ -3,7 +3,6 @@
     "list-loading": "../../../components/listloading",
     "empty-content": "../../../components/emptycontent",
     "activity-bar":"../../../components/activitybar",
-    "sjdbottombar":"../../../components/sjdbottombar",
     "guidecollection": "../../../components/guidecollection"
   },
   "navigationBarTitleText": "我的作业",

src/pages/mytask/index.wxml

@@ -120,9 +120,6 @@
             >
             </activity-bar>
         </view>
-        <view style="padding-bottom: env(safe-area-inset-bottom);">
-            <sjdbottombar></sjdbottombar>
-        </view>
         <guidecollection custom="{{1}}"/>
         <view class="footer">
             <view class="bottom-fix" bindtap="goGrowthRecord">

src/pages/papersquare/index.json

@@ -15,7 +15,6 @@
     "comment-editor": "../../../components/commenteditor",
     "activity-bar":"../../../components/activitybar",
     "advertisement":"../../components/advertisement",
-    "sjdbottombar":"../../../components/sjdbottombar",
     "guidecollection": "../../../components/guidecollection",
     "loginbtn":"../../../components/loginbtn",
     "gallery-card": "../../components/gallerycard"

src/pages/papersquare/index.wxml

@@ -366,7 +366,6 @@
     >
     </btabbar>
 
-    <sjdbottombar></sjdbottombar>
     <remark-editor wx:if="{{showNameSetDia}}" remark="{{remark}}" bind:closenamedia="closenamedia" circleid="{{id}}" bind:setname="setname"></remark-editor>
     <view class="" data-editor="commenteditor">
         <comment-editor wx:if="{{commenteditor}}" prams="{{commentclock}}" bind:hidecommenteditor="hidecommenteditor" type="2c"></comment-editor>

src/pages/rankingList/index.json

@@ -6,7 +6,6 @@
     "list-loading": "../../../components/listloading",
     "go-top": "../../../components/goTop",
     "activity-bar":"../../../components/activitybar",
-    "sjdbottombar":"../../../components/sjdbottombar",
     "empty-content": "../../../components/emptycontent",
     "guidecollection": "../../../components/guidecollection"
   }

src/pages/rankingList/index.wxml

@@ -147,7 +147,6 @@
         <view wx:if="{{totalEmpty}}" class="empty-content-box" >
           <empty-content text="还没有更多哦~" emptyimg="common/empty/empty_no.png" width="263" height="219"></empty-content>
         </view>
-        <sjdbottombar></sjdbottombar>
       </view>
       <view class="content-tab-wrapper" wx-if="{{bigCurrentTab==1}}">
         <view>
@@ -196,7 +195,6 @@
           <view wx:if="{{liketotalEmpty}}" class="empty-content-box" >
             <empty-content text="还没有更多哦~" emptyimg="common/empty/empty_no.png" width="263" height="219"></empty-content>
           </view>
-          <sjdbottombar></sjdbottombar>
         </view>
       </view>
       <view class="content-tab-wrapper" wx-if="{{bigCurrentTab==2}}">
@@ -249,7 +247,6 @@
       </view>
     </view>
   </view>
-  <sjdbottombar></sjdbottombar>
   <!-- <go-top wx:if="{{backTopValue}}"></go-top> -->
   <view class=""  wx:if="{{sid == activtySchoolInfo.sid}}">
     <activity-bar

src/pages/scoretasklist/index.json

@@ -10,7 +10,6 @@
     "list-loading": "../../../components/listloading",
     "scoregetfeedback": "../../../components/scoregetfeedback",
     "canvasdrawer": "/components/canvasdrawer/canvasdrawer",
-    "sjdbottombar":"../../../components/sjdbottombar",
     "guidecollection": "../../../components/guidecollection"
   }
 }
\ No newline at end of file

src/pages/scoretasklist/index.wxml

@@ -130,7 +130,6 @@
             </view>
         </block>
         <list-loading loading="{{clockGetting}}"></list-loading>
-        <sjdbottombar wx:if="{{!clockhasmore}}"></sjdbottombar>
     </view>
 
     <view class="empty-content-box" wx:if="{{clockemptyPage}}">

src/pages/setting/userinfoupdate.json

 {
   "usingComponents": {
     "imagecropper": "../../../components/imagecropper",
-    "sjdbottombar":"../../../components/sjdbottombar",
     "guidecollection": "../../../components/guidecollection"
   },
   "navigationBarTitleText": "编辑资料"

src/pages/setting/userinfoupdate.wxml

@@ -17,7 +17,6 @@
     </view>
   </view>
   <view class="submitbtn"      bindtap="save">保存设置</view>
-  <sjdbottombar></sjdbottombar>
   <view class="cropperdialog"      wx:if="{{showCropper}}">
       <imagecropper
           id="image-cropper"

src/pages/tasklist/index.json

@@ -4,7 +4,6 @@
     "list-loading": "../../../components/listloading",
     "empty-content": "../../../components/emptycontent",
     "activity-bar":"../../../components/activitybar",
-    "sjdbottombar":"../../../components/sjdbottombar",
     "guidecollection": "../../../components/guidecollection"
   },
   "navigationBarTitleText": "任务列表",

src/pages/tasklist/index.wxml

@@ -63,7 +63,6 @@
         </view>
         <view class="text"      >还没有任何任务哦~</view>
     </view>
-    <sjdbottombar></sjdbottombar>
     <view class=""      wx:if="{{sid == activtySchoolInfo.sid}}">
         <activity-bar
             classid="{{activtySchoolInfo.id}}"

src/pages/themeindex/index.wxml

@@ -216,7 +216,14 @@
                 <empty-content text="打卡后才能看到其他同学的打卡内容喔~" emptyimg="common/empty/empty_c_sraech.png" width="263" height="219"></empty-content>
             </view>
         </view>
-        <sjdbottombar></sjdbottombar>
+        <sjdbottombar 
+            showcontact="{{true}}" 
+            keyword="theme" 
+            pagetitle="我是机构，我也要用打卡 > > > " 
+            pagetitletip="立即使用"
+            sharetitle="我也要用打卡" 
+            coverimg="service/useclock.png"
+        ></sjdbottombar>
         <psd-editor bind:closepsddia="closepsddia" circleid="{{id}}" wx:if="{{showPsdDia}}" bind:checkPsd="checkPsd">
         </psd-editor>
         <remark-editor wx:if="{{showNameSetDia}}" remark="{{remark}}" bind:closenamedia="closenamedia" circleid="{{id}}"

src/pages/themeindex/rankList.json

@@ -6,7 +6,6 @@
     "list-loading": "../../../components/listloading",
     "go-top": "../../../components/goTop",
     "activity-bar":"../../../components/activitybar",
-    "sjdbottombar":"../../../components/sjdbottombar",
     "empty-content": "../../../components/emptycontent",
     "guidecollection": "../../../components/guidecollection"
   }

src/pages/themeindex/rankList.wxml

@@ -112,7 +112,6 @@
           <view wx:if="{{liketotalEmpty}}" class="empty-content-box" >
             <empty-content text="还没有更多哦~" emptyimg="common/empty/empty_no.png" width="263" height="219"></empty-content>
           </view>
-          <sjdbottombar></sjdbottombar>
         </view>
       </view>
     </view>

src/pages/themeranklist/index.json

@@ -5,7 +5,6 @@
     "empty-content": "../../../components/emptycontent",
     "list-loading": "../../../components/listloading",
     "activity-bar":"../../../components/activitybar",
-    "sjdbottombar":"../../../components/sjdbottombar",
     "guidecollection": "../../../components/guidecollection"
   }
 }
\ No newline at end of file

src/pages/themeranklist/index.wxml

@@ -51,13 +51,9 @@
       </view>
     </view>
     <list-loading loading="{{listLoading}}"></list-loading>
-    <sjdbottombar></sjdbottombar>
   </view>
 
-  <empty-content text="暂无数据~" emptyimg="common/empty/empty_no.png" width="263" height="219" wx:if="{{emptyPage}}"></empty-content>
-  <view wx:if="{{emptyPage}}" style="position: fixed; bottom: 0; left:50%; transform:translateX(-50%);">
-    <sjdbottombar></sjdbottombar>
-  </view>
+  <empty-content text="暂无数据~" emptyimg="common/empty/empty_no.png" width="263" height="219" wx:if="{{emptyPage}}"></empty-content>>
   <view class="" wx:if="{{sid == activtySchoolInfo.sid}}">
     <activity-bar
         classid="{{activtySchoolInfo.id}}"

src/pages/unlockranklist/index.json

@@ -5,7 +5,6 @@
     "empty-content": "../../../components/emptycontent",
     "list-loading": "../../../components/listloading",
     "activity-bar":"../../../components/activitybar",
-    "sjdbottombar":"../../../components/sjdbottombar",
     "guidecollection": "../../../components/guidecollection"
   }
 }
\ No newline at end of file

src/pages/unlockranklist/index.wxml

@@ -23,7 +23,6 @@
       </view>
     </view>
     <list-loading loading="{{listLoading}}"></list-loading>
-    <sjdbottombar></sjdbottombar>
     <!-- <view class="tech-support clearfix"      wx:if="{{!hasmore}}">
         <view class="short-line short-line-left"     ></view>
         <view class="tech-text"     >

src/pages/userMedal/index.json

@@ -3,7 +3,6 @@
     "onReachBottomDistance": 100,
     "usingComponents": {
       "activity-bar":"../../../components/activitybar",
-      "sjdbottombar":"../../../components/sjdbottombar",
       "guidecollection": "../../../components/guidecollection"
     }
   }
\ No newline at end of file

src/pages/userMedal/index.wxml

@@ -25,7 +25,6 @@
         <view class="footer-box">
         </view>
     </view>
-    <sjdbottombar></sjdbottombar>
     <view class="" wx:if="{{sid == activtySchoolInfo.sid}}">
         <activity-bar
             classid="{{activtySchoolInfo.id}}"

src/pages/userMedal/newindex.json

@@ -3,7 +3,6 @@
     "onReachBottomDistance": 100,
     "usingComponents": {
       "activity-bar":"../../../components/activitybar",
-      "sjdbottombar":"../../../components/sjdbottombar",
       "guidecollection": "../../../components/guidecollection"
     }
   }
\ No newline at end of file

src/pages/userMedal/newindex.wxml

@@ -29,7 +29,6 @@
             <text class="medalname" selectable="false" space="false" decode="false">坚持者</text>
         </view>
     </view>
-    <sjdbottombar></sjdbottombar>
     <view class="" wx:if="{{sid == activtySchoolInfo.sid}}">
         <activity-bar
             classid="{{activtySchoolInfo.id}}"

src/pages/websiteindex/index.wxml

@@ -185,7 +185,15 @@
             </video>
         </view>
 
-        <sjdbottombar></sjdbottombar>
+        
+        <sjdbottombar 
+            showcontact="{{true}}" 
+            keyword="website"
+            pagetitle="我是机构，我也要制作官网 > > > "
+            pagetitletip="立即制作"
+            sharetitle="我要制作官网" 
+            coverimg="service/website.png"
+        ></sjdbottombar>
     </view>
 
     <view class="fix-bottom-btn {{!fixBtnShow ?'hide':''}}" hidden="{{websiteCourses.switch!=1 || !fixBtnShow || !noUserinfo}}" data-flag="{{1}}">

ucenter/index.wxml

@@ -184,5 +184,13 @@
         </activity-bar>
     </view>
     <guidecollection/>
-    <sjdbottombar></sjdbottombar>
+    
+    <sjdbottombar 
+        showcontact="{{true}}" 
+        keyword="ucenter"
+        pagetitle="我也要用小程序 > > > "
+        pagetitletip="立即使用"
+        sharetitle="校区管理，打卡作业招生" 
+        coverimg="service/tosue.png"
+    ></sjdbottombar>
 </view>
\ No newline at end of file