1、修改登录登录

config/config.js

@@ -1,9 +1,9 @@
-const profiles = 'dev';
+const profiles = 'test';
 
 const configListObj = {
   // 北京东科企信软件有限公司 本地开发
   dev: {
-    server_add: 'http://192.168.0.55',     server_port: '7001',
+    server_add: 'http://192.168.0.57',     server_port: '7001',
     upload_url:'https://s.dev01.dkiboss.com:7000/api/mdm-server/file/upload',
     image_url:'https://s.dev01.dkiboss.com:7000/file',
     corpid: 'ww796c5d1684937b2f', //企业微信corpid
@@ -36,8 +36,10 @@ const configListObj = {
   },
   // 恒洁卫浴集团 正式环境
   pro: {
-    server_add: 'https://scrm.hegii.com',
+    server_add: 'https://zy.dkiboss.com',
     server_port: '443/api',
+    upload_url:'https://zy.dkiboss.com/api/mdm-server/file/upload',
+    image_url:'https://zy.dkiboss.com/file',
     corpid: 'ww2bc8a1bda0628c66', //企业微信corpid
     corpsecret: 'QjtmMud1QfHoGpcCkY-2h3p6aUfExnqkYFTMwn2Xu38', //秘钥
     key : 'S7ABZ-BH7CZ-WYQX2-7I33V-ROC76-YJFH5', //小程序插件 地图key

pages/login/login.wxml

@@ -5,27 +5,41 @@
     <view style="font-size: 24px;margin-top: 60rpx;">
       {{$t['homeTitle']}}
     </view>
-    <view style="margin-top: 190rpx; display: flex;">
-      <van-button custom-style="border-radius: 30rpx;  height:68rpx;width:180rpx; color: #131313;font-weight:500 " size="small" color="#ffffff" type="default" bindtap="freeClick"> {{$t['homeFreeLogin']}}</van-button>
-      <van-button custom-style="border-radius: 30rpx; margin-left:30rpx;height:68rpx;width:180rpx;border: 1rpx solid #FFFFFF " size="small" color="transparent" type="default" bindtap="productClick">{{$t['homeProduct']}}</van-button>
+    <view style="margin-top: 100rpx; display: flex;">
+      <!-- <van-button custom-style="border-radius: 30rpx;  height:68rpx;width:180rpx; color: #131313;font-weight:500 " size="small" color="#ffffff" type="default" bindtap="freeClick"> {{$t['homeFreeLogin']}}</van-button> -->
+
+      <!--了解产品-->
+      <!-- <van-button custom-style="border-radius: 30rpx; margin-left:30rpx;height:68rpx;width:180rpx;border: 1rpx solid #FFFFFF " size="small" color="transparent" type="default" bindtap="productClick">{{$t['homeProduct']}}</van-button> -->
 
     </view>
 
-    <view wx:if="{{flgTel}}" style="margin-top: 60rpx; display: flex;">      
-      <van-button size="small" custom-style="border-radius: 30rpx; margin-left:10rpx;height:60rpx;width:180rpx;" type="default" data-company='add' bind:click="addCompanyHasTel"  >{{$t['homeAddCompany']}}</van-button>
+    <view wx:if="{{flgTel}}" style="margin-top: 60rpx; display: flex;">
+      <van-button size="small" custom-style="border-radius: 30rpx; margin-left:10rpx;height:60rpx;width:180rpx;" type="default" data-company='add' bind:click="addCompanyHasTel">{{$t['homeAddCompany']}}</van-button>
       <!--  wx:if="{{flgCreate}}" 上线后 要加上 -->
-      <van-button size="small"  data-company='create' bind:click="addCompanyHasTel"  custom-style="border-radius: 30rpx;margin-left:30rpx ;height:60rpx;width:180rpx; " type="default"> {{$t['homeCreateCompany']}}</van-button>
+      <van-button wx:if="{{flgCreate}}" size="small" data-company='create' bind:click="addCompanyHasTel" custom-style="border-radius: 30rpx;margin-left:30rpx ;height:60rpx;width:180rpx; " type="default"> {{$t['homeCreateCompany']}}</van-button>
     </view>
 
-    <view wx:if="{{!flgTel}}" style="margin-top: 60rpx; display: flex;">      
+    <view wx:if="{{!flgTel}}" style="margin-top: 60rpx; display: flex;">
       <van-button size="small" custom-style="border-radius: 30rpx; margin-left:10rpx;height:60rpx;width:180rpx;" type="default" data-company='add' bind:click="addCompany" open-type="{{openType}}" bindgetphonenumber="handleGetPhoneNumber">{{$t['homeAddCompany']}}</van-button>
-<!--  wx:if="{{flgCreate}}" 上线后 要加上 -->
-      <van-button   size="small" open-type="{{openType}}" data-company='create' bind:click="addCompany" bindgetphonenumber="handleGetPhoneNumber" custom-style="border-radius: 30rpx;margin-left:30rpx ;height:60rpx;width:180rpx; " type="default"> {{$t['homeCreateCompany']}}</van-button>
+      <!--  wx:if="{{flgCreate}}" 上线后 要加上 -->
+      <van-button wx:if="{{flgCreate}}" size="small" open-type="{{openType}}" data-company='create' bind:click="addCompany" bindgetphonenumber="handleGetPhoneNumber" custom-style="border-radius: 30rpx;margin-left:30rpx ;height:60rpx;width:180rpx; " type="default"> {{$t['homeCreateCompany']}}</van-button>
+    </view>
+  </view>
+
+  <view class="foot-agreement-privacy" style="display: block;">
+    <view style="display: flex; width: 100%;justify-content: center;align-items: center;font-size: 15px;">
+      <van-button custom-style="border-radius: 30rpx;  height:68rpx;width:180rpx; font-weight:500 ;margin-bottom:60rpx;justify-content:center;width:220rpx" size="small" color="transparent" type="default" bindtap="freeClick">
+        <view style="display: flex;">
+          {{$t['homeFreeLogin']}}
+          <van-icon style="margin-left:20rpx" name="arrow" />
+        </view>
+      </van-button>
     </view>
 
-    <view class="foot-agreement-privacy">
+    <view style="display: flex;width: 100%;justify-content: center;align-items: center; color: #FFFFFF;">
       <van-checkbox custom-class="checkbox-class" shape="square" value="{{agreementPrivacy}}" bind:change="onCheckboxChange" />
-      <view style="padding-left: 10rpx;display: flex;"> {{$t['agreementPrivacy']}} <view style="text-decoration: underline;color: rgb(54, 153, 245);font-weight: bold;" data-type="user" catchtap="openAgreement">{{$t['userAgreement']}}</view>和<view style="text-decoration: underline;color: rgb(54, 153, 245);font-weight: bold;" data-type="privacy" catchtap="openAgreement">{{$t['privacyAgreement']}}</view></view>
+      <view style="padding-left: 10rpx;display: flex;"> {{$t['agreementPrivacy']}} <view style="text-decoration: underline;color: rgb(54, 153, 245);font-weight: bold;" data-type="user" catchtap="openAgreement">{{$t['userAgreement']}}</view>和<view style="text-decoration: underline;color: rgb(54, 153, 245);font-weight: bold;" data-type="privacy" catchtap="openAgreement">{{$t['privacyAgreement']}}</view>
+      </view>
     </view>
   </view>
 </view>

pages/login/login.wxss

@@ -29,7 +29,6 @@ page {
 	position: fixed;
 	font-size: 11px;
 	bottom: 45px;
-	left: 130rpx;
 	width: 100%;
 	display: flex;
 	align-items: center;

pages/mine/mine.js

@@ -331,7 +331,7 @@ Page({
    * @date : 2024/4/9
    */
   handleUpgrade(e) {
-    util.showToast('敬请期待');
+    util.showToast('功能开发中，敬请期待！');
     return
     let url = '/package-basic-data/pages/activity/activity?upgrade=true'
     wx.navigateTo({

pages/mine/mine.wxml

@@ -27,11 +27,11 @@
           <view style="width: 85%;">
             你好 {{staffName?staffName:''}}
           </view>
-          <view style="width: 15%;margin-top: -20rpx;">
+          <view style="width: 15%;margin-top: -10rpx;">
             <view style="display: flex;justify-content: center;">
               <image catchtap="handleWxService" src="{{imageUrl + '/wx.png'}}" style="width: 45rpx;height:45rpx;" />
             </view>
-            <view style="font-weight: 200;font-size: 9px;">官方客服</view>
+            <view style="font-weight: 200;font-size: 9px;display: flex;justify-content: center;">官方客服</view>
           </view>
           <!-- <view style="text-align: right;margin-right: 10rpx;" bindtap="toNotice">
             <view class="notice-view">