Browse Source

修改样式

lex-xin 9 months ago
parent
commit
de28736f52

+ 1 - 1
miniprogram/config.ts

@@ -1,4 +1,4 @@
-const environmentVariable = "dev";
+const environmentVariable = "test";
 const apiUrlInfo = {
 const apiUrlInfo = {
   dev: "https://dev.kt.colexiu.com",
   dev: "https://dev.kt.colexiu.com",
   test: "https://test.kt.colexiu.com",
   test: "https://test.kt.colexiu.com",

+ 3 - 0
miniprogram/pages/address/index.json

@@ -6,5 +6,8 @@
     "van-field": "@vant/weapp/field/index",
     "van-field": "@vant/weapp/field/index",
     "van-popup": "@vant/weapp/popup/index",
     "van-popup": "@vant/weapp/popup/index",
     "van-area": "@vant/weapp/area/index"
     "van-area": "@vant/weapp/area/index"
+  },
+  "window": {
+    "resize": true
   }
   }
 }
 }

+ 15 - 4
miniprogram/pages/address/index.less

@@ -93,7 +93,7 @@
     .update-btn {
     .update-btn {
       background: transparent;
       background: transparent;
       color: #FE2451;
       color: #FE2451;
-      border: 1rpx solid #FE2451;
+      border: 1rpx solid #FE2451 !important;
     }
     }
   }
   }
 }
 }
@@ -261,14 +261,25 @@ toolbar-confirm {
     .van-field__label {
     .van-field__label {
       color: #666666;
       color: #666666;
     }
     }
+    .van-field__control--textarea {
+      // padding: 0 !important;
+      // --cell-line-height: 80rpx !important;
+      height: 72rpx !important;
+    }
+    // .van-field__body--textarea {
+    //   --cell-line-height: 60rpx;
+    // }
+    // .field-index--van-field__control--textarea {
+    //   height: var(--field-text-area-min-height,18px) !important;
+    // }
 
 
     .van-icon-arrow {
     .van-icon-arrow {
       color: #BFBFBF;
       color: #BFBFBF;
     }
     }
 
 
-    .textarea {
-      max-height: 72rpx;
-    }
+    // .textarea {
+      // max-height: 72rpx;
+    // }
   }
   }
 
 
   .van-picker-column__item--selected {
   .van-picker-column__item--selected {

+ 15 - 0
miniprogram/pages/address/index.ts

@@ -18,6 +18,8 @@ Page({
     areaList: [] as any,
     areaList: [] as any,
     currentValues: [] as any,
     currentValues: [] as any,
 
 
+    showTextarea: true,
+
     // 添加地址表单信息
     // 添加地址表单信息
     id: "",
     id: "",
     name: '',
     name: '',
@@ -222,6 +224,18 @@ Page({
       selectAddressId: e.target.dataset.id
       selectAddressId: e.target.dataset.id
     })
     })
   },
   },
+  setShowTextarea() {
+    const _this = this
+    _this.setData({
+      showTextarea: false
+    })
+
+    setTimeout(() => {
+      _this.setData({
+        showTextarea: true
+      })
+    }, 100);
+  },
   /** 修改地址 */
   /** 修改地址 */
   onUpdateAddress(e: any) {
   onUpdateAddress(e: any) {
     const id = e.target.dataset.id
     const id = e.target.dataset.id
@@ -240,6 +254,7 @@ Page({
       regionCode: addressInfo.region,
       regionCode: addressInfo.region,
       regionName: addressInfo.regionName,
       regionName: addressInfo.regionName,
     }, () => {
     }, () => {
+      this.setShowTextarea()
       const cityCode: any = this.formateCityCode(true)
       const cityCode: any = this.formateCityCode(true)
       this.setData({
       this.setData({
         cityCode
         cityCode

+ 1 - 1
miniprogram/pages/address/index.wxml

@@ -47,7 +47,7 @@
           <van-field model:value="{{ name }}" label="收货人" placeholder="请填写收货人姓名" placeholder-style="color: #bbb" maxlength="50" />
           <van-field model:value="{{ name }}" label="收货人" placeholder="请填写收货人姓名" placeholder-style="color: #bbb" maxlength="50" />
           <van-field model:value="{{ phoneNumber }}" label="电话号码" type="number" placeholder-style="color: #bbb" placeholder="请输入手机号码" maxlength="11" />
           <van-field model:value="{{ phoneNumber }}" label="电话号码" type="number" placeholder-style="color: #bbb" placeholder="请输入手机号码" maxlength="11" />
           <van-field value="{{ provinceName ? provinceName + '/' + cityName + (regionName ? '/' + regionName : '' )  : '' }}" label="选择地区" placeholder-style="color: #bbb" placeholder="请选择省/市/区" readonly is-link bind:tap="onShowAreaList" />
           <van-field value="{{ provinceName ? provinceName + '/' + cityName + (regionName ? '/' + regionName : '' )  : '' }}" label="选择地区" placeholder-style="color: #bbb" placeholder="请选择省/市/区" readonly is-link bind:tap="onShowAreaList" />
-          <van-field model:value="{{ detailAddress }}" label="详细地址" type="textarea" placeholder-style="color: #bbb" placeholder="请填写小区/楼号/单元/门牌号" input-class="textarea" autosize fixed maxlength="100" />
+          <van-field wx:if="{{ showTextarea }}" model:value="{{ detailAddress }}" label="详细地址" type="textarea" placeholder-style="color: #bbb" placeholder="请填写小区/楼号/单元/门牌号" input-class="textarea" autosize maxlength="100" border="{{ false }}" />
         </van-cell-group>
         </van-cell-group>
 
 
         <view class="pop-btn-group">
         <view class="pop-btn-group">

+ 8 - 1
miniprogram/pages/index/index.less

@@ -658,20 +658,27 @@ page {
     align-items: flex-end;
     align-items: flex-end;
     padding-left: 8rpx;
     padding-left: 8rpx;
     font-weight: bold;
     font-weight: bold;
+    padding-bottom: 2rpx;
+    // vertical-align: baseline;
+    // text {
+    //   display: inline-block;
+    // }
   }
   }
 
 
   .stuff {
   .stuff {
     padding-right: 2rpx;
     padding-right: 2rpx;
     font-size: 36rpx;
     font-size: 36rpx;
+    line-height: 1.3;
   }
   }
 
 
   .priceZ {
   .priceZ {
     font-size: 56rpx;
     font-size: 56rpx;
-    line-height: 1;
+    line-height: 60rpx;
   }
   }
 
 
   .priceF {
   .priceF {
     font-size: 36rpx;
     font-size: 36rpx;
+    line-height: 1.3;
   }
   }
 }
 }
 
 

+ 11 - 0
miniprogram/pages/index/index.ts

@@ -579,6 +579,17 @@ Page({
           classIndex: users.classIndex
           classIndex: users.classIndex
         }, () => {
         }, () => {
           this.getSchoolAreaDetail()
           this.getSchoolAreaDetail()
+          const genderList = this.data.genderList
+          genderList.forEach((item: any, index: number) => {
+            if (item.value === users.gender) {
+              item.className = index === 0 ? 'one-gender select-gender' : 'two-gender select-gender'
+            } else {
+              item.className = index === 0 ? 'one-gender cancel-gender' : 'two-gender cancel-gender'
+            }
+          })
+          this.setData({
+            genderList
+          })
         })
         })
       }
       }
     } catch {
     } catch {

+ 10 - 3
miniprogram/pages/orders/order-detail.less

@@ -326,6 +326,12 @@ page {
     font-weight: bold;
     font-weight: bold;
     color: #131415;
     color: #131415;
     line-height: 48rpx;
     line-height: 48rpx;
+    display: flex;
+    align-items: center;
+
+    text {
+      display: inline-block;
+    }
 
 
     .before {
     .before {
       font-weight: 400;
       font-weight: 400;
@@ -515,6 +521,7 @@ page {
 
 
       .priceF {
       .priceF {
         font-size: 32rpx;
         font-size: 32rpx;
+        line-height: 1.2;
       }
       }
     }
     }
 
 
@@ -622,9 +629,9 @@ toolbar-confirm {
       color: #BFBFBF;
       color: #BFBFBF;
     }
     }
 
 
-    .textarea {
-      max-height: 72rpx;
-    }
+    // .textarea {
+      // max-height: 72rpx;
+    // }
   }
   }
 
 
   .van-picker-column__item--selected {
   .van-picker-column__item--selected {

+ 2 - 2
miniprogram/pages/orders/order-detail.wxml

@@ -80,9 +80,9 @@
           <view class="goodsInfo-count">
           <view class="goodsInfo-count">
             <view class="goods-price">
             <view class="goods-price">
               <text class="before">共{{ goodsInfo.goodsList.length }}件:</text>
               <text class="before">共{{ goodsInfo.goodsList.length }}件:</text>
-              <text class="stuff">¥</text>
+              <view class="gp"><text class="stuff">¥</text>
               <text class="priceZ">{{ goodsInfo.integerPart }}</text>
               <text class="priceZ">{{ goodsInfo.integerPart }}</text>
-              <text class="priceF">.{{ goodsInfo.decimalPart }}</text>
+              <text class="priceF">.{{ goodsInfo.decimalPart }}</text></view>
             </view>
             </view>
           </view>
           </view>
         </view>
         </view>

+ 3 - 1
miniprogram/pages/orders/order-result.less

@@ -102,7 +102,9 @@ page {
       font-weight: bold;
       font-weight: bold;
       font-size: 28rpx;
       font-size: 28rpx;
       color: #131415;
       color: #131415;
-      line-height: 48rpx;
+      line-height: 46rpx;
+      display: flex;
+      align-items: center;
        text {
        text {
         font-size: 32rpx;
         font-size: 32rpx;
         padding-left: 4rpx;
         padding-left: 4rpx;

+ 10 - 6
miniprogram/pages/orders/orders.less

@@ -191,31 +191,34 @@
       //   line-height: 48rpx;
       //   line-height: 48rpx;
       // }
       // }
       
       
-        display: flex;
-        align-items: flex-end;
+        // display: flex;
+        // align-items: flex-end;
     
     
         .desc {
         .desc {
           font-size: 24rpx;
           font-size: 24rpx;
           color: #999;
           color: #999;
           line-height: 40rpx;
           line-height: 40rpx;
           flex-shrink: 0;
           flex-shrink: 0;
+          display: inline-block;
         }
         }
     
     
         .currentPrice {
         .currentPrice {
           font-weight: bold;
           font-weight: bold;
           color: #FE2451;
           color: #FE2451;
           font-family: DINAlternate, DINAlternate;
           font-family: DINAlternate, DINAlternate;
-          display: flex;
+          // display: flex;
           // align-items: flex-end;
           // align-items: flex-end;
+          display: inline-block;
+          padding-bottom: 2rpx;
     
     
           .stuff {
           .stuff {
             font-size: 28rpx;
             font-size: 28rpx;
-            padding: 2rpx 4rpx 0;
+            padding: 0rpx 4rpx 0;
           }
           }
     
     
           .priceZ {
           .priceZ {
             font-size: 40rpx;
             font-size: 40rpx;
-            line-height: 1;
+            // line-height: 1;
           }
           }
     
     
           .priceF {
           .priceF {
@@ -224,10 +227,11 @@
         }
         }
     
     
         .line {
         .line {
-          margin: 0 12rpx 8rpx;
+          margin: 0 12rpx 0rpx;
           background-color: #D2D2D2;
           background-color: #D2D2D2;
           width: 2rpx;
           width: 2rpx;
           height: 20rpx;
           height: 20rpx;
+          display: inline-block;
         }
         }
     
     
         .discountPrice {
         .discountPrice {