Merge branch 'develop' of http://101.37.147.115:3000/mz666/bocai_supplyChain into develop

pages/login/index.js

@@ -18,8 +18,13 @@ Page({
     formPath: "",
     loginType: "tel", // 登录类型
     password: null,
-    showPSW: false
+    showPSW: false,
-
+    switchChecked:false,
+  },
+  switchChange(){
+    this.setData({
+      switchChecked:!this.data.switchChecked
+    })
   },
   wxLogin () {
     var that = this;
@@ -209,11 +214,21 @@ Page({
     //   },
     // });
   },
+  checkCheck(){
+    var that = this;
+    if(!that.data.switchChecked){
+      app.showTips(that, "请先同意用户服务协议及隐私协议");
+      return;
+    }
+  },
   getPhoneNumber (e) {
     var that = this;
     console.log(e);
-    console.log(e.detail.errMsg);
+    console.log(that.data.switchChecked);
-
+    if(!that.data.switchChecked){
+      app.showTips(that, "请先同意用户服务协议及隐私协议");
+      return;
+    }
     if ("getPhoneNumber:ok" == e.detail.errMsg || "phonenumber:ok" == e.detail.errMsg) {
       //同意
       wx.showLoading({
@@ -666,6 +681,13 @@ Page({
   beforeFormSubmit (e) {
     console.log(e);
     let that = this;
+
+    if(!that.data.switchChecked){
+      app.showTips(that, "请先同意用户服务协议及隐私协议");
+      return;
+    }
+
+
     if (that.data.loginType == "tel") {
       this.formSubmit(e.detail.value);
     } else {

pages/login/index.wxml

@@ -56,12 +56,13 @@
         <text class="weui-loadmore__tips f16" style="color:#999">或</text>
       </view>
       <!-- #endif -->
-      <view class="onlyBtn" style="margin-top:0px;">
+      <view class="onlyBtn" style="margin-top:0px;position:relative">
         <!--  #if MP -->
 
         <button type class="loginBtn wxBtn ysd-base-bgcolor" style="display:flex;justify-content:center;align-items:center;" hover-class="loginBtnHov" open-type="getPhoneNumber" catchgetphonenumber="getPhoneNumber">
           <i class="iconfont icon-shouji1 mr8"></i>手机号快捷登录
         </button>
+        <view class="m-mask" bindtap="checkCheck" wx:if="{{!switchChecked}}" style="position: absolute; left: 0; top: 0; width: 100%; height: 100%"></view>
         <!-- #elif ANDROID -->
 
         <!-- <button type class="loginBtn wxBtn ysd-base-bgcolor" style="display:flex;justify-content:center;align-items:center;" hover-class="loginBtnHov" bindtap="appLogin">
@@ -69,9 +70,18 @@
         </button> -->
         <!-- #endif -->
       </view>
+      <view class="f12 c9 g_flex_row_center g_mb_32" style="align-items: center; margin-top: 16px">
+        <radio-group class="dib ">
+          <radio checked="{{switchChecked}}" bindtap="switchChange" value="0" class="dib biggerSize" color="#1890ff" style="transform: scale(0.7)" />
+        </radio-group>
+        我已阅读并同意
+        <navigator url="/pages/serviceTerm/index" class="aLink">《用户服务协议》</navigator>
+        及
+        <navigator url="/pages/secret/index" class="aLink">《隐私政策》</navigator>
+      </view>
     </form>
   </view>
-
+  
   <view class="tc bocai" style="font-size:12px;color: #999;line-height: 32px;box-sizing: border-box;">
     <image src="http://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/b.svg" style="width:16px;height:16px;vertical-align: text-bottom;position: relative" mode="aspectFit"></image>伯才人力资源供应链平台 荣誉出品
   </view>

pages/login/index.wxss

@@ -154,7 +154,10 @@ label.radio:last-child {
 }
 .loginForm {
 	padding: 0 37px;
-	margin-top: -20%;
+	/* margin-top: -20%; */
+}
+.aLink{
+  color: #1890ff;
 }
 
 .phoneInput {

pages/mine/index.wxml

@@ -435,6 +435,19 @@
               </view>
             </view>
           </navigator>
+<!-- #if ANDROID -->
+          <navigator class url="{{isLogin? '/pages/opinion/index': '/pages/login/index'}}">
+            <view class="br_8" hover-class="none" style="background-color:#fff" hover-stop-propagation="false">
+              <view class="setting mt_10" hover-class="thover">
+                <view>
+                  <view class="t-icon t-icon-fankuiyujianyi mr6 ticon" style="width:22px;height:22px" hover-class="none" hover-stop-propagation="false"></view>
+                  <view class>投诉/举报</view>
+                </view>
+                <view class="iconfont icon-gengduo11"></view>
+              </view>
+            </view>
+          </navigator>
+          <!-- #endif -->
           <!-- style="margin-bottom: 200px;" -->
           <navigator class="mb12" hover-class target url="{{isLogin? '/pages/setting/index': '/pages/login/index'}}">
             <view class="br_8" hover-class="none" style="background-color:#fff" hover-stop-propagation="false">

pages/setting/index.js

@@ -11,7 +11,13 @@ Page({
     drawerShow: false,
     teamList: [],
   },
-
+  previewImage(e) {
+    const url = e.currentTarget.dataset.url;
+    wx.previewImage({
+      current: url, // 当前显示图片的链接
+      urls: [url], // 需要预览的图片链接列表
+    });
+  },
   /**
    * 生命周期函数--监听页面加载
    */

pages/setting/index.wxml

@@ -73,6 +73,13 @@
     </view>
   </view>
    <!-- #if ANDROID || IOS -->
+   <view class="tc mt30">
+    <view class="f12 f40" bindtap="previewImage" data-url="https://matripe-cms.oss-cn-beijing.aliyuncs.com/bocaigongyinglian/zhizhao.jpg">《营业执照》</view>
+    <view class="f12 f40 mt10" bindtap="previewImage" data-url="https://matripe-cms.oss-cn-beijing.aliyuncs.com/bocaigongyinglian/renfu.jpg">《人力资源服务许可证》</view>
+  </view>
+
+
+
   <view catchtap="logOff" style="position: absolute;bottom:40px; left: 50%;transform: translateX(-50%);" hover-class="thover">
     <view class="tc mt120">
       <text class="f12 c9">注销账号</text>