chengjunhui před 2 měsíci
rodič
revize
096a245753

+ 2 - 2
app.js

@@ -7,8 +7,8 @@ App({
   /**
    * 全局变量
    */
-  // apiRoot: "https://qingyunhui.songlanyun.com/qyh/api/", // 正式环境api地址
-  apiRoot: 'http://192.168.0.181:8687/qyh/api/',
+  apiRoot: "https://qingyunhui.songlanyun.com/qyh/api/", // 正式环境api地址
+  // apiRoot: 'http://192.168.0.181:8687/qyh/api/',
   // apiRoot: 'http://192.168.0.193:8687/qyh/api/',
 
   // apiRoot: 'http://192.168.0.193:8687/qyh/api/',

+ 2 - 1
expert/agentdetail/agentdetail.js

@@ -31,7 +31,8 @@ Page({
 	/**
 	 * 生命周期函数--监听页面加载
 	 */
-	onLoad: function(options) {
+	onLoad: function (options) {
+		console.log(options)
 		this.setData({
 			id: options.id,
 			memberId: options.id

+ 23 - 8
pages/home/index/index.js

@@ -107,12 +107,12 @@ Page({
     this.experience();
   },
   experience(e) {
-    console.log(e, 11111111);
+    // console.log(e, 11111111);
     if (
       e.currentTarget.dataset.index == 4 ||
       e.currentTarget.dataset.index == 3
     ) {
-      if (wx.getStorageSync("USER")) {
+      // if (wx.getStorageSync("USER")) {
         const obj = this.data.goodsClassfiyList.find(v => v.name == '联名福利') || '';
         // console.log(obj);
         wx.setStorageSync('classfiyId', obj ? obj.id : '')
@@ -120,11 +120,11 @@ Page({
           url: e.currentTarget.dataset.index == 4 ?
             "/invitationCode/index" : `/pages/quality/index/index`,
         });
-      } else {
-        wx.navigateTo({
-          url: "/pages/login",
-        });
-      }
+      // } else {
+      //   wx.navigateTo({
+      //     url: "/pages/login",
+      //   });
+      // }
     } else {
       app.params.pePageToIndex =
         e === undefined ? 0 : e.currentTarget.dataset.index + 1;
@@ -649,6 +649,7 @@ Page({
       platform,
       statusBarHeight
     } = wx.getSystemInfoSync();
+    console.log("statusBarHeight======", statusBarHeight);
     let statusBarHeightTop = statusBarHeight;
     let height = statusBarHeight + 4; //ios 24px
     let mH = statusBarHeight + 4;
@@ -659,11 +660,25 @@ Page({
     height = height + 100;
     // height = height + 38 + 118;
     // 胶囊高度 32px 下边框6px height 状态栏高度
+    let then = this
     this.setData({
       statusBarHeightTop: statusBarHeightTop + "px",
-      statusBarHeight: height - 12 + "px",
+      statusBarHeight: statusBarHeight + 88 + "px",
       statusBarMH: mH + "px",
+    }, res => {
+      // console.log("加载完成======", height);
+      // 创建选择器查询
+      // const query = wx.createSelectorQuery();
+      // console.log("query======", query);
+      // 选择 id 为 diy-top 的节点
+      wx.createSelectorQuery().in(this).select('#diy-top').boundingClientRect(rect => {
+        // console.log("rect===", rect)      //这 里有值 
+        then.setData({
+          statusBarHeight: rect.height + "px"
+        })
+      }).exec();
     });
+
   },
   loadDictionary() {
     let _this = this;

+ 2 - 2
pages/home/index/index.wxml

@@ -4,8 +4,8 @@
   <!--background: linear-gradient(180deg, #e2eaff 0%, #F7F8FA 100%);-->
   <view>
     <view style="width:100%;height:{{statusBarHeight}};"></view>
-    <view class="diy-top"
-      style="height:{{statusBarHeight}};padding-top:{{statusBarHeightTop}};background: {{activeTitle ? 'linear-gradient(180deg, #cad8ff 0%, #e7edfe 100%)' : ''}};">
+    <view class="diy-top" id="diy-top"
+      style="padding-top:{{statusBarHeightTop}};padding-bottom: 20rpx; background: {{activeTitle ? 'linear-gradient(180deg, #cad8ff 0%, #e7edfe 100%)' : ''}};">
       <view class="title">青雲慧</view>
       <view class="index-wrap-box">
         <view class="index-container">

+ 9 - 7
pages/home/index/index.wxss

@@ -1389,7 +1389,7 @@
     to(#f8f8f8)
   ); */
   padding-left: 30rpx;
-  margin-top: 46rpx;
+  margin-top: 24rpx;
   border-radius: 20rpx;
   position: relative;
   /* //x偏移 y偏移 模糊量 阴影延展 颜色 */
@@ -1610,10 +1610,10 @@
 
 .jianzhi-box {
   border-radius: 20rpx;
-  padding: 30rpx 30rpx 0;
-  margin-bottom: 46rpx;
+  padding: 24rpx 30rpx 0;
+  margin-bottom: 24rpx;
   box-sizing: border-box;
-  margin-top: 25rpx;
+  /* margin-top: 25rpx; */
 }
 
 .jianzhi-item {
@@ -2403,7 +2403,7 @@
 /* 分类管理 */
 .classfiy-box {
   padding: 0 30rpx 0;
-  margin-bottom: 46rpx;
+  margin-bottom: 24rpx;
   box-sizing: border-box;
 }
 
@@ -2432,6 +2432,7 @@
 }
 
 .classfiy-box .main .goods-item .goods-btn {
+  max-width: 424rpx;
   flex: 1;
   min-height: 210rpx;
   display: flex;
@@ -2446,7 +2447,7 @@
   white-space: nowrap;
   font-weight: 700;
   font-size: 30rpx;
-  margin-bottom: 8rpx;
+
 }
 
 .classfiy-box .main .goods-item .goods-btn .desc {
@@ -2612,5 +2613,6 @@
 }
 
 .popup2Btns #agree-btn1 {
-  background: #ffdc2f !important;
+  background: #2b58a5 !important;
+  color: #ffffff !important;
 }

+ 1 - 0
pages/login.wxss

@@ -1205,6 +1205,7 @@ page {
   width: 276rpx;
   height: 276rpx;
   margin: 50rpx auto 0 auto;
+  border-radius: 50%;
 }
 
 .li2 {

+ 2 - 2
pages/match/index.wxss

@@ -101,7 +101,7 @@
   margin-bottom: 16rpx;
   line-height: 1.3;
   display: -webkit-box;
-  -webkit-line-clamp: 1;
+  -webkit-line-clamp: 2;
   -webkit-box-orient: vertical;
   overflow: hidden;
 }
@@ -111,7 +111,7 @@
   color: #666666;
   line-height: 1.5;
   display: -webkit-box;
-  -webkit-line-clamp: 3;
+  -webkit-line-clamp: 2;
   -webkit-box-orient: vertical;
   overflow: hidden;
 }

+ 1 - 1
pages/my/index/index.js

@@ -331,7 +331,7 @@ Page({
       function (res) {
         if (res.code === 0) {
           that.setData({
-            isDev: res.wgFillInfo.isDev,
+            isDev: res.wgFillInfo ? res.wgFillInfo.isDev : false,
           });
         }
       }

+ 1 - 1
pages/my/index/index.wxml

@@ -44,7 +44,7 @@
                 <!-- 会员升级提示 -->
                 <view class="vip-upgrade-banner" bindtap="onVipUpgradeTap" style="background-image: url('{{appAssetsUrl3}}user-icon/vip-upgrade-bg.png');" wx:if="{{!isDev &&  isLogin}}">
                     <view class="vip-banner-left" wx:if="{{userInfo.memberState != 0}}">
-                        <image src="{{appAssetsUrl3}}user-icon/vip-icon.png" class="upgrade-icon"></image>
+                        <image src="{{appAssetsUrl3}}user-icon/vip-icon2.png" class="upgrade-icon"></image>
                         <text class="upgrade-text">青雲慧 {{userInfo.cardno}}</text>
                     </view>
                     <view class="vip-banner-left" wx:else>