Merge branch 'master' of git.huaml.com:zhh/front-end

ghsApp/src/admin/home/components/OrderItem.vue

@@ -149,7 +149,7 @@
         <block v-if="item.sendStatus == -2">
           <view class="text-center"><button class="admin-button-com" @click="callIntraCity(item)">呼叫跑腿</button></view>
         </block>
-        <block v-else-if="item.sendStatus == 0 || item.sendStatus == 1 || item.sendStatus == 4 || item.sendStatus == 5">
+        <block v-else-if="item.sendStatus == -1 || item.sendStatus == 0 || item.sendStatus == 1 || item.sendStatus == 4 || item.sendStatus == 5">
           <view class="text-center"><button class="admin-button-com" @click="cancelExpressOrder(item)">取消跑腿</button></view>
         </block>
         <block v-else-if="item.sendStatus == 3">

ghsApp/src/pagesOrder/detail.vue

@@ -33,7 +33,7 @@
 							{{ detailInfo.sendStatus==-1?'等平台确认': detailInfo.sendStatus==0?'等跑腿接单':detailInfo.sendStatus==1?'跑腿已接单':detailInfo.sendStatus==2?'已送达':detailInfo.sendStatus==3?'已取消':detailInfo.sendStatus==4?'跑腿已到店':detailInfo.sendStatus==5?'跑腿配送中':'未知'}}
 						</view>
 						<view class="express-actions">
-							<button class="admin-button-com mini-btn btn-danger" v-if="detailInfo.sendStatus == '0' || detailInfo.sendStatus == '1'" @click.stop="cancelMyExpress(detailInfo.id)">取消跑腿</button>
+							<button class="admin-button-com mini-btn btn-danger" v-if="detailInfo.sendStatus == '-1' || detailInfo.sendStatus == '0' || detailInfo.sendStatus == '1'" @click.stop="cancelMyExpress(detailInfo.id)">取消跑腿</button>
 							<button class="admin-button-com mini-btn" v-if="detailInfo.sendStatus == '3'" @click.stop="openExpressPage()">重叫跑腿</button>
 						</view>
 					</view>

hdApp/src/admin/goods/goodsSort.vue

@@ -52,10 +52,7 @@
             </view>
 
             <view class="list-det" style="position: absolute; bottom: 15upx; left: 122upx">
-              <view v-if="item.priceType == 1" class="app-size-28 app-color-0" style="font-size: 24upx">¥{{ item.price }}</view>
-              <view v-else class="app-size-28 app-color-0" style="font-size: 24upx; border: 1px solid #ccc; border-radius: 30upx; padding: 3upx 15upx"
-                >没价格</view
-              >
+              <view v-if="item.priceType == 1" class="app-size-28 app-color-0" style="font-size: 24upx">¥{{ item.price?parseFloat(item.price):0 }}</view>
             </view>
             <view
               v-if="index > 0"

hdApp/src/admin/home/workbench.vue

@@ -107,7 +107,7 @@
               <view class="icon-wrapper">
                 <image class="icon-image" :src="`${constant.hostUrl}/image/ghs/home/pandian2.png`" mode="aspectFit"></image>
               </view>
-              <view class="icon-text" style="color:#3385FF;font-weight:bold;">快捷开单</view>
+              <view class="icon-text" style="font-weight:bold;">快捷开单</view>
             </view>
             <view class="icon-item" @click="goPage({url: '/admin/work/list'})">
               <view class="icon-wrapper">
@@ -166,7 +166,7 @@
               <view class="icon-wrapper">
                 <image class="icon-image" :src="`${constant.hostUrl}/image/ghs/home/pandian2.png`" mode="aspectFit"></image>
               </view>
-              <view class="icon-text" style="color:#3385FF;font-weight:bold;">快捷开单</view>
+              <view class="icon-text" style="font-weight:bold;">快捷开单</view>
             </view>
             <view class="icon-item" @click="goPage({url: '/admin/part/list'})">
               <view class="icon-wrapper">

hdApp/src/admin/order/detail.vue

@@ -16,7 +16,7 @@
         <view class="module-det">
           <view class="order-msg-blo">
             <view class="msg-list">
-              <view class="label"><text @click="showMySimPop">配</text>送平台：</view>
+              <view class="label"><text @click="showMySimPop">配送平台：</text></view>
               <view class="value">{{getExpressPlatformText(orderInfo.deliveryId)}}</view>
             </view>
             <view class="msg-list express-progress-row">
@@ -25,7 +25,7 @@
 							  {{ orderInfo.sendStatus==-1?'等平台确认': orderInfo.sendStatus==0?'等跑腿接单':orderInfo.sendStatus==1?'跑腿已接单':orderInfo.sendStatus==2?'已送达':orderInfo.sendStatus==3?'已取消':orderInfo.sendStatus==4?'跑腿已到店':orderInfo.sendStatus==5?'跑腿配送中':'未知'}}
               </view>
               <view class="express-actions">
-                <button class="admin-button-com mini-btn btn-danger" v-if="orderInfo.sendStatus == '0' || orderInfo.sendStatus == '1'" @click.stop="cancelMyExpress(orderInfo.id)">取消跑腿</button>
+                <button class="admin-button-com mini-btn btn-danger" v-if="orderInfo.sendStatus == '-1' || orderInfo.sendStatus == '0' || orderInfo.sendStatus == '1'" @click.stop="cancelMyExpress(orderInfo.id)">取消跑腿</button>
                 <button class="admin-button-com mini-btn" v-if="orderInfo.sendStatus == '3'" @click.stop="openExpressPage(orderInfo.id)">重叫跑腿</button>
               </view>
             </view>

hdApp/src/components/module/app-search.vue

@@ -5,19 +5,19 @@
 				<i class="iconfont" :class="[icon]"></i>
 			</div>
 			<div class="input-wrap">
-				<input
-					type="text" 
-					:placeholder-style="`color:${placeholderColor}`"
-					ref="searchInput"
-					v-model="search"
-					:focus="focus"
-					@input="inputFn" @focus="inputEmptyFn"
-					:style="{ fontSize: fontSize + 'rpx' }"
-					:placeholder="placeholder"
-					:placeholder-class="placeholderClass"
-					@confirm="searchFn"
-					confirm-type="search"
-				/>
+			<input
+				type="text" 
+				:placeholder-style="`color:${placeholderColor}`"
+				ref="searchInput"
+				v-model="search"
+				:focus="focus"
+				@input="inputFn" @focus="inputEmptyFn"
+				:style="{ fontSize: fontSize + 'rpx' }"
+				:placeholder="placeholder"
+				placeholder-class="placeholder"
+				@confirm="searchFn"
+				confirm-type="search"
+			/>
 			</div>
 		</div>
 		<block v-if="isBtn">
@@ -94,15 +94,10 @@ export default {
 			type: Boolean,
 			default: false
 		},
-		// placeholder样式类名
-		placeholderClass: {
-			type: String,
-			default: "placeholder"
-		},
-		// placeholder颜色
+		// placeholder 颜色
 		placeholderColor: {
 			type: String,
-			default: "red"
+			default: "#ccc"
 		},
 	},
 	data() {
@@ -155,7 +150,7 @@ export default {
 				text-align: left;
 			}
 			.placeholder {
-				color: #ccc;
+				color: var(--placeholder-color, #ccc);
 			}
 		}
 	}

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -23,7 +23,7 @@
 				<button class="admin-button-com middle blue" @click="selectFlowerNumFn()">图片分类</button>
 			</view>
 			<view class="search-bar">
-				<app-search-module v-model="py" placeholder="最少输二到三字搜索" @input="goSearchFn" />
+				<app-search-module v-model="py" placeholder="最少输二到三字搜索" placeholder-color="red" @input="goSearchFn" />
 			</view>
 			<view style="padding:0 0upx 0 20upx;" >
 				<button class="admin-button-com middle blue" v-if="ghsInfo.presell && ghsInfo.presell == 1" style="background-color:#09C567;border:1upx solid #09C567;" @click="aheadCg(ghsInfo)">预订花材</button>