zhanghui 2 سال پیش
والد
کامیت
b6e595107d

+ 1 - 1
myPages/recharge/index.vue

@@ -29,7 +29,7 @@
 						</view>
 						<view class="recharge-balance">
 							<view class="h-nav-img">
-								<image src="../../static/transaction/u4.png" mode=""></image>
+								<image src="../../static/transaction/ud4.png" mode=""></image>
 							</view>
 							<view class="name">赠送优惠券</view>
 							<view class="balance-value">

+ 1 - 1
myPages/serviceObjectInfo/index.vue

@@ -10,7 +10,7 @@
                     </view>
                     <view @click="uploadImg1(1)" class="arrow-right">
                         <view class="head-img">
-                            <image :src="userInfo.facePhotoUrl || '/static/me/u4.png'" mode="aspectFill"></image>
+                            <image :src="userInfo.facePhotoUrl || '/static/me/ud4.png'" mode="aspectFill"></image>
                         </view>
                     </view>
                 </view>

+ 1 - 1
myPages/userInfo/index.vue

@@ -10,7 +10,7 @@
 					<text>头像</text>
 				</view>
 					<button class="photoView" open-type="chooseAvatar" @chooseavatar="chooseavatar">
-						<image class="photoImage" :src="userInfo.selfPhotoUrl || '/static/me/u4.png'"></image>
+						<image class="photoImage" :src="userInfo.selfPhotoUrl || '/static/me/ud4.png'"></image>
 					</button>
 			</view>
 

+ 3 - 3
orderPages/bookService/index.vue

@@ -10,7 +10,7 @@
 				<u-grid-item v-for="(item,index) in serviceObjectList" :key="index">
 					<view class="serobItem flex-col" >
 						<view class="serobImgView" @click="selectServiceObject(item)">
-							<image class="serobImg" mode="aspectFill" :src="item.facePhotoUrl || '/static/me/u4.png'"></image>
+							<image class="serobImg" mode="aspectFill" :src="item.facePhotoUrl || '/static/me/ud4.png'"></image>
 						</view>
 						<text class="serobName">{{item.nickName || '未填写'}}</text>
 						<view class="serobV" v-if="item.select === true">
@@ -23,7 +23,7 @@
 
 		<view class="flex-col group " v-for="(item, index) in orderParam.childService">
 			<view class="flex-row " >
-				<image class="selectSerobImg" mode="aspectFill" :src="item.facePhotoUrl || '/static/me/u4.png'"></image>
+				<image class="selectSerobImg" mode="aspectFill" :src="item.facePhotoUrl || '/static/me/ud4.png'"></image>
 				<text class="selectSerobName">{{item.nickName || '未填写'}}</text>
 			</view>
 			<view class="serob">
@@ -34,7 +34,7 @@
 					<u-grid-item  v-for="(item1,index1) in item.serviceTeacherList" :key="index1">
 						<view class="serobItem flex-col"  @click="selectServiceTeach(item.serviceTeacherList,index,index1)">
 							<view class="serobImgView">
-								<image class="serobImg" mode="aspectFill" :src="item1.facePhotoUrl || '/static/me/u4.png'"></image>
+								<image class="serobImg" mode="aspectFill" :src="item1.facePhotoUrl || '/static/me/ud4.png'"></image>
 							</view>
 							<text class="serobName ">{{item1.personName || '未填写'}}</text>
 							<view class="flex-row justify-center ">

+ 1 - 1
orderPages/orderDetail/index.vue

@@ -88,7 +88,7 @@
 
 		<view class="bottomHeight"></view>
 
-		<view class="bottom1 flex-col">
+		<view class="bottom1 flex-col" v-if="canPay">
 			<text class="allMoney"></text>
 			<view class="bottomBtn flex-row justify-between">
 				<view class=" flex-row">

+ 1 - 1
orderPages/storeService/index.vue

@@ -10,7 +10,7 @@
 				<u-grid-item v-for="(item,index) in serviceObjectList" :key="index">
 					<view class="serobItem flex-col">
 						<view class="serobImgView" @click="selectServiceObject(item)">
-							<image class="serobImg" mode="aspectFill" :src="item.facePhotoUrl || '/static/nullAva.png'">
+							<image class="serobImg" mode="aspectFill" :src="item.facePhotoUrl || '/static/me/ud4.png'">
 							</image>
 						</view>
 						<text class="serobName">{{item.nickName || '未填写'}}</text>

+ 39 - 39
pages/index/index.vue

@@ -25,7 +25,7 @@
             <!-- 欢迎语 -->
             <view class="welcome-wrap">
               <view class="logo">
-                <image  :src="userInfo.selfPhotoUrl || '/../static/logo.png'" mode=""></image>
+                <image  :src="userInfo.selfPhotoUrl || '/../static/ud4.png'" mode=""></image>
               </view>
               <view class="text">
                 <view class="phone">{{ userInfo.cellPhone || ''}}</view>
@@ -183,43 +183,43 @@
           </view>
 
           <!-- 为你推荐 -->
-          <view class="recommend-wrap">
-            <view class="recommend-nav">
-              <view class="icon">
-                <image src="/static/index/u87.png" mode=""></image>
-              </view>
-              <view class="title">
-                为你推荐
-              </view>
-            </view>
-            <!-- 分割线 -->
-            <view class="custom-line"></view>
-            <!-- 门店列表 -->
-            <view class="store-wrap ">
-              <view class="store-list">
-                <view class="store-content">
-                  <view class="store-img">
-                    <image src="../../static/logo.png" mode=""></image>
-                  </view>
-                  <view class="h-store-content">
-                    <view class="title">
-                      <text>{{ storeInfo.storeName }}</text>
-                    </view>
-                    <view class="adress">
-                      地址:{{ storeInfo.address }}
-                    </view>
-                    <view class="desc">
-                      <view class="price">
-                      </view>
-                      <view @click="gotoGoods()" class="order-btn">
-                        <view class="btn">去下单</view>
-                      </view>
-                    </view>
-                  </view>
-                </view>
-              </view>
-            </view>
-          </view>
+<!--          <view class="recommend-wrap">-->
+<!--            <view class="recommend-nav">-->
+<!--              <view class="icon">-->
+<!--                <image src="/static/index/u87.png" mode=""></image>-->
+<!--              </view>-->
+<!--              <view class="title">-->
+<!--                为你推荐-->
+<!--              </view>-->
+<!--            </view>-->
+<!--            &lt;!&ndash; 分割线 &ndash;&gt;-->
+<!--            <view class="custom-line"></view>-->
+<!--            &lt;!&ndash; 门店列表 &ndash;&gt;-->
+<!--            <view class="store-wrap ">-->
+<!--              <view class="store-list">-->
+<!--                <view class="store-content">-->
+<!--                  <view class="store-img">-->
+<!--                    <image src="../../static/logo.png" mode=""></image>-->
+<!--                  </view>-->
+<!--                  <view class="h-store-content">-->
+<!--                    <view class="title">-->
+<!--                      <text>{{ storeInfo.storeName }}</text>-->
+<!--                    </view>-->
+<!--                    <view class="adress">-->
+<!--                      地址:{{ storeInfo.address }}-->
+<!--                    </view>-->
+<!--                    <view class="desc">-->
+<!--                      <view class="price">-->
+<!--                      </view>-->
+<!--                      <view @click="gotoGoods()" class="order-btn">-->
+<!--                        <view class="btn">去下单</view>-->
+<!--                      </view>-->
+<!--                    </view>-->
+<!--                  </view>-->
+<!--                </view>-->
+<!--              </view>-->
+<!--            </view>-->
+<!--          </view>-->
           <view class="footer ">
             <view class="">---到底了---</view>
           </view>
@@ -554,7 +554,7 @@ export default {
 
 /* 头部内容 */
 .head-wrap {
-  height: 1850rpx;
+  height: 1300rpx;
   background: #FFE05C;
 
   .content-info {

+ 1 - 1
pages/my/index.vue

@@ -8,7 +8,7 @@
       <view class="userInfo flex-row justify-between  ">
         <view class="flex-row">
           <view class="userPhoto" @click="navigateToPage('/myPages/userInfo/index')">
-            <image class="userPhoto" :src="userInfo.selfPhotoUrl || '/static/me/u4.png'"></image>
+            <image class="userPhoto" :src="userInfo.selfPhotoUrl || '/static/me/ud4.png'"></image>
           </view>
           <view class="userTitle flex-col justify-center" @click="navigateToPage('/myPages/userInfo/index')">
             <text class="nickName">HI,亲爱的{{ userInfo.ncikName }}</text>

+ 3 - 3
pages/order/module/mescrollUni-item.vue

@@ -65,10 +65,10 @@
 <!--							<view class="btn" v-if="!item.canPay && item.orderStatus == 6"  @click="orderFinish(item)">-->
 <!--								<text>结束订单</text>-->
 <!--							</view>-->
-							<view class="btn"  @click="oneClickPay(item)">
+							<view class="btn" v-if="item.canPay"  @click="oneClickPay(item)">
 								<text>一键付款</text>
 							</view>
-							<view class="btn" v-if="item.orderStatus == 5 || item.orderStatus == 11" @click="cancelOrder(item)">
+							<view class="btn" v-if="item.canCancel" @click="cancelOrder(item)">
 								<text>取消</text>
 							</view>
 							<view @click="appointment(item)" class="btn" v-if="item.orderStatus == 9">
@@ -79,7 +79,7 @@
 <!--								<text>点击查看排号</text>-->
 <!--							</view>-->
 
-							<view @click="orderSign(item)" class="btn">
+							<view v-if="item.canSignIn" @click="orderSign(item)" class="btn">
 								<u-icon name="/static/order/saoma.png" color="#2979ff" size="20"></u-icon>
 								<text>扫码签到</text>
 							</view>

BIN
static/me/ud4.png