Merge branch 'oil' of 39.97.239.116:gyfl/minixyz into oil

pages/components/auth/auth.wxml

@@ -9,7 +9,7 @@
   </view>
 
   <button wx:if="{{showAuthName}}" 
-          style='margin-top:160rpx;width:82%;height: 92rpx;  background-color: #fe7124; background: linear-gradient(to right, #ff7a21 0%,#feb25a 100%);color: #fff;' 
+          style='margin-top:160rpx;width:82%;height: 92rpx;border:none;  background-color: #fe7124; background: linear-gradient(to right, #ff7a21 0%,#feb25a 100%);color: #fff;' 
           open-type="getUserInfo"
           bindgetuserinfo="userInfoHandler">授权登录</button>
   <button wx:if="{{showAuthPhone}}" 

pages/components/shareDialog/shareDialog.js

@@ -9,7 +9,25 @@ Component({
   properties: {
     showDialog:{
       type:Boolean,
-      value:false
+      value:false,
+      observer:function(newVal,oldVal){
+        console.log(this.properties);
+        const _self = this;
+        const parmas = this.properties;
+        if(newVal == true) {
+          _self.getDataTimer = setInterval(function(){
+            let goods_id = parmas.goods_id
+            if(goods_id > 0) {
+              _self.requestData(goods_id);
+            }
+          },5000)
+        }
+        else {
+          if(_self.getDataTimer) {
+            clearInterval(this.getDataTimer)
+          }
+        }
+      }
     },
     goods_id: {
       type: Number,

pages/invitees/invitees.json

@@ -1,3 +1,4 @@
 {
-  "usingComponents": {}
+  "usingComponents": {},
+  "navigationBarTitleText": "好友列表"
 }

pages/myhome/myhome.json

@@ -1,7 +1,7 @@
 {
   "navigationBarTitleText": "个人中心",
-  "navigationBarBackgroundColor": "#fe7124",
-  "navigationBarTextStyle": "white",
+  "navigationBarBackgroundColor": "#ffffff",
+  "navigationBarTextStyle": "black",
   "usingComponents": {
     "auth": "../components/auth/auth"
   }

pages/myhome/myhome.wxss

@@ -9,7 +9,7 @@
   left: 0;
   width: 100%;
   height: 80rpx;
-  background-color: #fe7124;
+  /* background-color: #fe7124; */
   z-index: 1;
 }
 .header{
@@ -17,7 +17,8 @@
   z-index: 2;
   display: flex;
   width: 690rpx;
-  margin: 0 auto;
+  margin: 22rpx auto;
+  margin-bottom: 0;
   padding: 40rpx;
   border-radius: 15rpx;
   background-color: #fff;

pages/phoneCharges/phoneCharges.wxss

@@ -92,8 +92,8 @@
 .tabs-content,.rechargeGear-footer{
   padding: 30rpx 30rpx 0 70rpx;
   background-color: #fff;
-  border-bottom-left-radius: 10rpx;
-  border-bottom-right-radius: 10rpx;
+  border-bottom-left-radius: 20rpx;
+  border-bottom-right-radius: 20rpx;
 }
 
 .rechargeGear-footer {
@@ -139,11 +139,15 @@
   margin-bottom: 0
 }
 
+.rechargeGear {
+  background: #fff;
+}
+
 /* 充值挡位 */
 .rechargeGear-title{
   height: 84rpx;
   line-height: 84rpx;
-  background-color: #fff;
+  /* background-color: #fff; */
   color: #1e242e;
   padding-left: 30rpx;
   border-top-left-radius: 10rpx;
@@ -154,7 +158,7 @@
   display: flex;
   flex-wrap: wrap;
   justify-content: space-between;
-  background-color: #fff;
+  /* background-color: #fff; */
   box-sizing: border-box;
   padding: 0 30rpx;
 }
@@ -172,6 +176,7 @@
   background-color: #fff;
   margin-bottom: 30rpx;
   font-weight: bolder;
+  box-sizing: border-box;
 }
 
 .rechargeGear-content__item.active {
@@ -195,8 +200,8 @@
 }
 
 .border-top-radius{
-  border-top-left-radius: 10rpx;
-  border-top-right-radius: 10rpx;
+  border-top-left-radius: 20rpx;
+  border-top-right-radius: 20rpx;
 }
 
 

pages/postage/postage.wxss

@@ -34,6 +34,10 @@
   overflow: hidden;
 }
 
+.rechargeGear {
+  background: #fff;
+}
+
 .tabs-title {
   display: flex;
   justify-content: space-between;
@@ -147,7 +151,7 @@
 .rechargeGear-title {
   height: 84rpx;
   line-height: 84rpx;
-  background-color: #fff;
+  /* background-color: #fff; */
   color: #1e242e;
   padding-left: 30rpx;
   border-top-left-radius: 10rpx;
@@ -158,7 +162,7 @@
   display: flex;
   flex-wrap: wrap;
   justify-content: space-between;
-  background-color: #fff;
+  /* background-color: #fff; */
   box-sizing: border-box;
   padding: 0 30rpx;
 }
@@ -176,6 +180,7 @@
   background-color: #fff;
   margin-bottom: 30rpx;
   font-weight: bolder;
+  box-sizing: border-box;
 }
 
 .rechargeGear-content__item.active {
@@ -251,13 +256,13 @@
   background: #EE7530;
 }
 
-.bindMobileBox .line {
+/* .bindMobileBox .line {
   position: absolute;
   left: 35rpx;
   top: 60rpx;
   width: 1rpx;
   height: ;
-}
+} */
 
 .bindMobileLabel {
   margin-bottom: 16rpx;

pages/postageDetail/postageDetail.json

@@ -1,4 +1,4 @@
 {
-  "navigationBarBackgroundColor": "#fe7124",
-  "navigationBarTextStyle": "white"
+  "navigationBarBackgroundColor": "#ffffff",
+  "navigationBarTextStyle": "black"
 }

pages/postageManage/postageManage.json

@@ -1,5 +1,5 @@
 {
   "navigationBarTitleText": "卡列表",
-  "navigationBarBackgroundColor": "#fe7124",
-  "navigationBarTextStyle": "white"
+  "navigationBarBackgroundColor": "#ffffff",
+  "navigationBarTextStyle": "black"
 }