shish 3 лет назад
Родитель
Сommit
685f175f8f

+ 2 - 2
ghsApp/src/admin/home/member.vue

@@ -2,7 +2,7 @@
   <view class="app-main app-content">
   <view class="app-main app-content">
     <view class="input-wrap_box">
     <view class="input-wrap_box">
       <view>
       <view>
-        <AppSearchModule placeholder="输拼音首字母搜" @input="searchFn"/>
+        <AppSearchModule placeholder="输拼音首字母也可以搜" @input="searchFn"/>
       </view>
       </view>
       <view style="padding:0 10upx 0 20upx;" >
       <view style="padding:0 10upx 0 20upx;" >
         <button class="admin-button-com middle blue" style="margin-right:10upx;" @click="showAllShop()">拉取客户</button>
         <button class="admin-button-com middle blue" style="margin-right:10upx;" @click="showAllShop()">拉取客户</button>
@@ -27,7 +27,7 @@
                 <span v-if="tabIndex == 1" class="debt-amount">消费 <span class="amount_num">{{parseFloat(item.buyAmount)}}</span> </span>
                 <span v-if="tabIndex == 1" class="debt-amount">消费 <span class="amount_num">{{parseFloat(item.buyAmount)}}</span> </span>
                 <span v-else>
                 <span v-else>
                   <span v-if="item.debtAmount>0" class="debt-amount">
                   <span v-if="item.debtAmount>0" class="debt-amount">
-                    <span @click.stop="pageTo({url:'/pagesArrears/details',query:{id:item.id}})" class="amount_num">-¥{{parseFloat(item.debtAmount)}}</span>
+                    <span class="amount_num">-¥{{parseFloat(item.debtAmount)}}</span>
                   </span>
                   </span>
                 </span>
                 </span>
               </div>
               </div>

+ 3 - 3
ghsApp/src/pagesClient/member/detail.vue

@@ -5,10 +5,10 @@
       <view class="module-com user-info">
       <view class="module-com user-info">
         <view class="user-info_top">
         <view class="user-info_top">
             <view class="user-info_lf">
             <view class="user-info_lf">
-                <image :src="userInfo.avatar" style="width:110upx;height:110upx;position:absolute;border-radius:10upx;"></image>
+                <image :src="userInfo.avatar" @click="changeNameFn()" style="width:110upx;height:110upx;position:absolute;border-radius:10upx;"></image>
                 <view class="dec-bx">
                 <view class="dec-bx">
                   <view>
                   <view>
-                      <text style="font-weight:bold;">{{userInfo.name}}</text> <text @click="changeNameFn()" style="color:#3385ff;margin-left:30upx;font-size:28upx;">修改</text>
+                      <text style="font-weight:bold;" @click="changeNameFn()">{{userInfo.name}}</text> <text @click="changeNameFn()" style="color:#3385ff;margin-left:32upx;font-size:30upx;">修改</text>
                   </view>
                   </view>
                   <view>{{userInfo.originName}}</view>
                   <view>{{userInfo.originName}}</view>
                   <view>ID {{userInfo.sn}}</view>
                   <view>ID {{userInfo.sn}}</view>
@@ -113,7 +113,7 @@
 			<div class="app-modal-input-wrap">
 			<div class="app-modal-input-wrap">
 			<div class="inp-list-line">
 			<div class="inp-list-line">
 				<div class="line-input">
 				<div class="line-input">
-				<input type="number" ref="input" style="width:61.8%;text-align:center;" :focus="changeFocus" v-model="customName" :adjust-position="false" class="inp-input" />
+				<input type="text" style="width:61%;text-align:center;" :focus="changeFocus" v-model="customName" class="inp-input" />
 				</div>
 				</div>
 			</div>
 			</div>
 			</div>
 			</div>

+ 1 - 1
ghsApp/src/pagesOrder/detail.vue

@@ -56,7 +56,7 @@
 						<i class="iconfont icondagou" style="font-size:35upx;"></i>
 						<i class="iconfont icondagou" style="font-size:35upx;"></i>
 					</view>
 					</view>
 				</view>
 				</view>
-				<view class="order-info_box" v-if="detailInfo.status != 1 && detailInfo.status!=5">
+				<view class="order-info_box" v-if="detailInfo.status != 1 && detailInfo.status!=5 && detailInfo.customShopAdminId != 0">
 					<view>支付方式:</view>
 					<view>支付方式:</view>
 					<view>{{ detailInfo.payWay==0?'微信':detailInfo.payWay==1?'支付宝':detailInfo.payWay==2?'余额':detailInfo.payWay==4?'现金':detailInfo.payWay==5?'银行卡':'--' }}</view>
 					<view>{{ detailInfo.payWay==0?'微信':detailInfo.payWay==1?'支付宝':detailInfo.payWay==2?'余额':detailInfo.payWay==4?'现金':detailInfo.payWay==5?'银行卡':'--' }}</view>
 				</view>
 				</view>