Quellcode durchsuchen

feat:我的页面bug修改

xyh8905170 vor 2 Jahren
Ursprung
Commit
11fa1f4756

+ 42 - 48
myPages/ServiceObjectManagement/index.vue

@@ -26,9 +26,6 @@
             </view>
             <input class="custom-input" v-model="userInfo.nickName" type="text" placeholder="请输入昵称">
           </view>
-          <view class="arrow-right">
-            <!-- <u-icon name="arrow-right" color="#666" size="16"></u-icon> -->
-          </view>
         </view>
       </view>
       <view class="custom-line"></view>
@@ -106,12 +103,12 @@
         <view class="nav-info">
           <view class="nav-desc">
             <view class="nav-name">
-              <view class="">关系</view>
+              <text class="">关系</text>
             </view>
             <input class="custom-input" v-model="userInfo.blood" type="text" placeholder="请输入有关系(如父子)">
           </view>
-          <view class="arrow-right">
-          </view>
+<!--          <view class="arrow-right">-->
+<!--          </view>-->
         </view>
       </view>
       <view class="custom-line"></view>
@@ -139,9 +136,7 @@
             <view class="nav-name">
               <view class="">备注</view>
             </view>
-            <input class="custom-input" v-model="userInfo.remark" type="text" placeholder="请输入昵称">
-          </view>
-          <view class="arrow-right">
+            <input   class="custom-input" v-model="userInfo.remark" type="text" placeholder="请输入备注信息">
           </view>
         </view>
       </view>
@@ -203,14 +198,13 @@ export default {
   onLoad(option) {
 
     // 判断Openid是否为空
-    if (!this.$isDataEmpty(option.data)) {
+    if (option.data) {
       const data = JSON.parse(option.data);
       this.userInfo = data;
       if (this.userInfo.ranks != '0') {
         this.userInfo.ranksState = '1';
       }
     }
-    console.log("333333333333333333333333333”")
     console.log(this.userInfo)
 
   },
@@ -319,24 +313,24 @@ export default {
 @import './index.rpx.scss';
 
 .user-info-wrap {
-  margin-left: 12px;
-  margin-right: 12px;
+  margin-left: 24rpx;
+  margin-right: 24rpx;
 
   /* 导航菜单 */
   .nav-bar {
     background: #fff;
-    border-radius: 10px;
-    margin-top: 12px;
+    border-radius: 20rpx;
+    margin-top: 24rpx;
 
     /* 商店信息 */
     .nav-content {
-      padding-right: 6px;
-      padding-top: 10px;
-      padding-bottom: 6px;
+      padding-right: 12rpx;
+      padding-top: 20rpx;
+      padding-bottom: 12rpx;
 
       .nav-info {
         display: flex;
-        padding-left: 10px;
+        padding-left: 20rpx;
         align-items: center;
 
         .logo {
@@ -344,36 +338,36 @@ export default {
           text-align: center;
 
           image {
-            width: 24px;
-            height: 24px;
+            width: 48rpx;
+            height: 48rpx;
           }
         }
 
         .nav-desc {
-          width: 46%;
+          width: 100%;
           display: flex;
-          line-height: 30px;
+          line-height: 60rpx;
           font-family: PingFangSC-Regular, PingFang SC;
           font-weight: 400;
           align-items: center;
 
           .custom-input {
-            font-size: 12px;
+            font-size: 24rpx;
           }
 
           .nav-name {
             width: 60%;
-            font-size: 14px;
+            font-size: 28rpx;
             color: #333333;
-            line-height: 22px;
+            line-height: 44rpx;
           }
 
           .change-store {
             text-align: right;
             width: 40%;
-            font-size: 12px;
+            font-size:24rpx;
             color: #333333;
-            line-height: 22px;
+            line-height: 44rpx;
           }
         }
 
@@ -382,30 +376,30 @@ export default {
           text-align: right;
           margin: 0 auto;
           cursor: pointer;
-          padding-top: 3px;
+          padding-top: 6rpx;
           display: flex;
           justify-content: flex-end;
           align-items: center;
 
           image {
-            width: 18px;
-            height: 18px;
+            width: 36rpx;
+            height: 36rpx;
           }
 
           .head-img {
             text-align: center;
-            padding-right: 20px;
+            padding-right: 40rpx;
 
             image {
-              width: 24px;
-              height: 24px;
+              width: 48rpx;
+              height: 48rpx;
             }
           }
 
           .change-store {
-            font-size: 14px;
+            font-size: 28rpx;
             color: #999;
-            line-height: 22px;
+            line-height: 44rpx;
           }
         }
       }
@@ -413,18 +407,18 @@ export default {
   }
 
   .sure-btn {
-    margin-top: 20px;
+    margin-top: 40rpx;
     width: 100%;
 
     .btn {
       text-align: center;
-      height: 42px;
+      height: 84rpx;
       background: #FFE05C;
-      border-radius: 27px;
+      border-radius: 54rpx;
       color: #333333;
-      line-height: 42px;
-      margin-top: 12px;
-      font-size: 14px;
+      line-height: 84rpx;
+      margin-top: 24rpx;
+      font-size: 24rpx;
     }
   }
 }
@@ -435,21 +429,21 @@ export default {
 }
 
 .button {
-  padding: 6px 12px;
-  font-size: 14px;
+  padding: 12rpx 24rpx;
+  font-size: 28rpx;
   background-color: #e6e6e6;
   border: none;
-  border-radius: 4px;
+  border-radius: 8rpx;
   cursor: pointer;
 }
 
 .custom-input-ranks {
-  width: 30px;
-  font-size: 12px;
+  width: 60rpx;
+  font-size: 24rpx;
   text-align: center;
 }
 
 .radio-item {
-  padding-right: 6px;
+  padding-right: 12rpx;
 }
 </style>

+ 12 - 1
orderPages/storeService/index.rpx.scss

@@ -30,9 +30,20 @@
 }
 
 .text-group_2 {
+    //border: 2rpx solid blue;
+    width: 650rpx;
     display: flex;
     flex-direction: column;
+    //justify-content: space-between;
 }
+.text-group_3{
+    //border: 2rpx solid blue;
+    width: 686rpx;
+    display: flex;
+    //flex-direction: column;
+    justify-content: space-between;
+}
+
 
 .text_3 {
     overflow-wrap: break-word;
@@ -70,4 +81,4 @@
     height: 2rpx;
     margin-top: 24rpx;
     display: flex
-}
+}

+ 8 - 9
orderPages/storeService/index.vue

@@ -11,13 +11,15 @@
                 </view>
                 <view class="group_2"></view>
                 <view class="group_1">
-                    <view class="text-group_2">
-                        <text lines="1" class="text_3">服务类型</text>
-                        <picker @change="bindPickerChange" mode='selector' range-key="typeName" :value="index" :range="storeServiceList">
-                            <view class="text_4">{{storeServiceList[index].typeName}}</view>
-                        </picker>
+                  <picker @change="bindPickerChange" mode='selector'  range-key="typeName" :value="index" :range="storeServiceList">
+                    <view >
+                      <text lines="1" class="text_3 ">服务类型</text>
+                      <view  class="text-group_3 ">
+                        <view class="text_4">{{storeServiceList[index].typeName || '111111' }}</view>
+                        <u-icon name="arrow-right" color="#666" size="18"></u-icon>
+                      </view>
                     </view>
-                    <u-icon name="arrow-right" color="#666" size="18"></u-icon>
+                  </picker>
                 </view>
                 <view class="group_2"></view>
             </view>
@@ -46,10 +48,7 @@
 			}
 		},
 		onLoad() {
-
-
 		},
-
         onShow(){
             // 服务对象
             uni.$off()

+ 4 - 8
pages/index/index.vue

@@ -103,10 +103,10 @@
 							<!-- 左边内容 -->
 							<view @click="gotoServiceOrder()" class="left-content">
 								<view class="title">
-									服务点单
+									到店服务
 								</view>
 								<view class="desc">
-									多种服务模式任您选择
+<!--									多种服务模式任您选择-->
 								</view>
 								<view class="bg-img">
 									<image src="../../static/index/u65.png" mode=""></image>
@@ -115,10 +115,10 @@
 							<!-- 右边内容 -->
 							<view class="right-content"  @click="goBookService()">
 								<view class="title">
-									产品点单
+									预约服务
 								</view>
 								<view class="desc">
-									拼命研发中敬请期待...
+<!--									拼命研发中敬请期待...-->
 								</view>
 								<view class="bg-img">
 									<image src="../../static/index/u67.png" mode=""></image>
@@ -198,12 +198,8 @@
 										<view class="adress">
 											地址:{{storeInfo.address}}
 										</view>
-										<!-- <view class="price">
-											标准价格:<span class="red">¥200</span>
-										</view> -->
 										<view class="desc">
 											<view class="price">
-												<!-- 人均消费¥35起 -->
 											</view>
 											<view @click="gotoGoods()" class="order-btn">
 												<view class="btn">去下单</view>

+ 1 - 0
pages/my/index.vue

@@ -105,6 +105,7 @@ export default {
 				{thumb:'/static/me/u1796.png',title:'贡献奖励记录',url:'',rightText:'',to:''},
 				{thumb:'/static/me/u1803.png',title:'实名认证',url:'',rightText:'',to:'/myPages/realNameAuth/index'},
 				{thumb:'/static/me/u1812.png',title:'服务对象管理',url:'',rightText:'',to:'/myPages/ServiceObjectManagement/index'},
+        {thumb:'/static/me/编组_18@2x.png',title:'推广中心',url:'',rightText:'',to:''},
 				{thumb:'/static/me/u1833.png',title:'新老系统切换',url:'',rightText:'',to:'/myPages/systemSwitch/index'},
 				{thumb:'/static/me/u826.png',title:'储值服务',url:'',rightText:'',to:'/myPages/recharge/index'}
 			],

+ 0 - 14
pages/order/index.rpx.scss

@@ -23,7 +23,6 @@
   width: 600rpx;
   text-align: center;
   font-size: 28rpx;
-  font-family: PingFangSC-Semibold, PingFang SC;
   line-height: 60rpx;
   background: white;
   border-radius: 15rpx;
@@ -98,19 +97,12 @@
   .service-order-tab-item.active {
     color: #ff0000;
   }
-
-  .underline {
-    border-bottom: 4rpx solid #ff0000;
-  }
 }
 
 /* 服务订单内容*/
 .service-order {
   margin-top: 24rpx;
   /* 门店列表 */
-
-
-
   .store-wrap {
     background: #fff;
     // border-radius: 24rpx;
@@ -118,21 +110,17 @@
     padding-left: 24rpx;
     padding-right: 24rpx;
     padding-bottom: 24rpx;
-
     box-shadow: rgba(0, 0, 0, 0.1) 0px 4px 12px;
     // border: 2rpx dashed rgb(103, 100, 100) ;
-
     .grayscale {
       filter: grayscale(100%);
     }
-
     .order-state {
       display: flex;
       font-size: 24rpx;
       align-items: center;
 
       .order-num {
-
         // width: 70%;
         // display: flex;
         // align-items: center;
@@ -149,7 +137,6 @@
             transform: translateY(8rpx);
           }
         }
-
         .h-order-text {
           margin-right: 6rpx;
           font-size: 28rpx;
@@ -158,7 +145,6 @@
           color: #666666;
         }
       }
-
       .order-state-name {
         width: 30%;
         text-align: right;

+ 1 - 6
pages/order/index.vue

@@ -121,22 +121,17 @@
 			},
 			swiperChange(e) {
 				this.tabIndex = e.detail.current
-				// if (this.$refs.MescrollItem[e.detail.current].orderList.length>0){
-				// 	this.$refs.MescrollItem[e.detail.current].downCallback()
-				// }
 			},
 
 			changeTab(currentTab) {
 				this.currentTab = currentTab
 			},
 
-
-
 		}
 	}
 </script>
 
 <style scoped lang="scss">
-	@import '/common/css/common.css';
+	//@import '/common/css/common.css';
 	@import './index.rpx.scss';
 </style>