Просмотр исходного кода

Merge branch 'master' into after-sale

shish 14 часов назад
Родитель
Сommit
690c89fca3

+ 0 - 8
hdApp/src/admin/billing/affirmSh.vue

@@ -109,14 +109,6 @@
 							</view>
 							</view>
 						</view>
 						</view>
 
 
-						<!-- 配送地址状态提示 -->
-						<tui-list-cell v-if="form.sendType == 2 && ghsInfo.openIntraCity != 1" class="line-cell" :hover="false" :arrow="false">
-							<view>
-								<text v-if="ghsInfo.openIntraCity == 0" style="color: #3385FF;width:100%;font-size:30upx;font-weight:bold;">运费自理或到付(请联系客服)</text>
-								<text v-if="ghsInfo.openIntraCity == 2" style="color: red;width:100%;font-size:30upx;font-weight:bold;">跑腿配送暂不可用,请选其它方式</text>
-							</view>
-						</tui-list-cell>
-
 						<!-- 收货地址 -->
 						<!-- 收货地址 -->
 						<tui-list-cell class="line-cell" :hover="false" :arrow="true" v-if="displayAddress" @click="modifyAddress">
 						<tui-list-cell class="line-cell" :hover="false" :arrow="true" v-if="displayAddress" @click="modifyAddress">
 							<view class="tui-title">收花地址</view>
 							<view class="tui-title">收花地址</view>

+ 1 - 0
hdApp/src/assets/svg-icons/general/customerService.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1785746702311" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2993" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M139.6 372.4v232.7H46.5V372.4h93.1m0-46.6H46.5c-25.6 0-46.5 21-46.5 46.6v232.7c0 25.6 20.9 46.5 46.5 46.5h93.1c25.6 0 46.5-20.9 46.5-46.5V372.4c0.1-25.6-20.9-46.6-46.5-46.6zM977.5 372.4v232.7h-93.1V372.4h93.1m0-46.6h-93.1c-25.6 0-46.5 20.9-46.5 46.5V605c0 25.6 20.9 46.5 46.5 46.5h93.1c25.6 0 46.5-20.9 46.5-46.5V372.4c0-25.6-20.9-46.6-46.5-46.6zM512 791.3c51.3 0 93.1 41.8 93.1 93.1s-41.8 93.1-93.1 93.1-93.1-41.8-93.1-93.1 41.8-93.1 93.1-93.1m0-46.6c-77.1 0-139.6 62.5-139.6 139.6S434.9 1024 512 1024s139.6-62.5 139.6-139.6S589.1 744.7 512 744.7zM418.9 325.8h-93.1v93.1h93.1v-93.1zM698.2 325.8h-93.1v93.1h93.1v-93.1zM672.3 558.5c-32.3 55.4-91.7 93.1-160.3 93.1s-128-37.7-160.3-93.1h-52.8c35.9 82.1 117.7 139.6 213.1 139.6s177.1-57.5 213.1-139.6h-52.8z" fill="#515151" p-id="2994"></path><path d="M117.5 325.8C175.2 163.4 330 46.5 512 46.5s336.8 116.8 394.5 279.3h49.6C896.8 137 720.4 0 512 0S127.2 137 67.9 325.8h49.6zM886.7 651.6c-48.2 96.6-132.4 171.8-235.1 208.3v49.6C780.4 869 884.9 774 938.4 651.6h-51.7z" fill="#515151" p-id="2995"></path></svg>

+ 120 - 12
hdApp/src/pagesPurchase/ghsProduct.vue

@@ -38,7 +38,7 @@
 
 
 		<view class="input-wrap" >
 		<view class="input-wrap" >
 			<view class="header-action-wrap header-action-wrap--left">
 			<view class="header-action-wrap header-action-wrap--left">
-				<button class="admin-button-com blue header-action-btn" @click="selectFlowerNumFn()">图片分类</button>
+				<button class="admin-button-com blue header-action-btn" @click="selectFlowerNumFn()">图片筛选</button>
 			</view>
 			</view>
 			<view class="search-bar">
 			<view class="search-bar">
 				<app-search-module v-model="py" placeholder="最少输二到三字搜索" placeholder-color="red" @input="goSearchFn" />
 				<app-search-module v-model="py" placeholder="最少输二到三字搜索" placeholder-color="red" @input="goSearchFn" />
@@ -177,22 +177,33 @@
 		</uni-popup>
 		</uni-popup>
 
 
 		<uni-popup ref="showWx" type="center" :animation="false" class="class-popup-style-wx">
 		<uni-popup ref="showWx" type="center" :animation="false" class="class-popup-style-wx">
-			<view style="width:80vw;background-color: white;border-radius:15upx;padding:35upx 0 35upx 0;">
-				<view style="margin:40upx 0 20upx 0;font-size:34upx;font-weight:bold;width:80vw;text-align:center;">请长按识别二维码</view>
-				<image :src="superWx" style="width:50vw;margin:0 auto;" mode="widthFix" show-menu-by-longpress="true"></image>
-				<view style="margin:30upx 0 30upx 0;font-size:30upx;font-weight:bold;width:80vw;text-align:center;display: flex;align-items: center; justify-content: center;" @click="callUp()">
-					<text style="font-size:34upx;">联系电话:{{ telephone }}</text>
-					<button class="admin-button-com mini-btn blue" style="margin-left:20upx;">拨打</button>
+			<!-- 微信客服弹层:二维码 + 电话 + 关闭,统一卡片排版 -->
+			<view class="wx-popup-card">
+				<text class="wx-popup-title">请长按识别二维码</text>
+				<view class="wx-popup-qr-wrap">
+					<image
+						class="wx-popup-qr"
+						:src="superWx"
+						mode="widthFix"
+						show-menu-by-longpress="true"
+					></image>
 				</view>
 				</view>
-				<view style="width:80vw;margin:60upx 0 60upx 0;display:flex;align-items: center; justify-content: center;">
-					<button class="admin-button-com big blue" style="width:260upx;" @click="closeWxShow()">关闭</button>
+				<view class="wx-popup-phone" @click="callUp()">
+					<text class="wx-popup-phone-label">联系电话</text>
+					<text class="wx-popup-phone-num">{{ telephone }}</text>
+					<button class="admin-button-com mini-btn blue wx-popup-call-btn" @click.stop="callUp()">拨打</button>
 				</view>
 				</view>
+				<button class="admin-button-com big blue wx-popup-close-btn" @click="closeWxShow()">关闭</button>
 			</view>
 			</view>
 		</uni-popup>
 		</uni-popup>
 
 
-		<view v-if="superWx!=''" @click="toViewWx" style="width:200upx;height:84upx;position:fixed;bottom:210upx;right:-34upx;border-radius:40upx;background: rgba(0,0,0,.60);display: flex;align-items: center;">
-			<image :src="`${constant.imgUrl}/mall/wx_code2.png`" style="width:74upx;height:74upx;margin-left:8upx;" mode="widthFix"></image>
-			<view style="width:90upx;color:white;margin-left:8upx;">扫码添加微信</view>
+		<!-- 客服入口:图标按钮,点击打开微信二维码弹层 -->
+		<view
+			v-if="superWx!=''"
+			class="wx-service-float"
+			@click="toViewWx"
+		>
+			<zui-svg-icon icon="general-customerService" :width="28" :height="28"></zui-svg-icon>
 		</view>
 		</view>
 
 
 		<view v-if="ghsInfo.black && ghsInfo.black == 2" style="position:fixed;bottom:180upx;z-index:99999;
 		<view v-if="ghsInfo.black && ghsInfo.black == 2" style="position:fixed;bottom:180upx;z-index:99999;
@@ -918,6 +929,85 @@ export default {
 	z-index:999999;
 	z-index:999999;
 	border-radius:20upx;
 	border-radius:20upx;
 }
 }
+
+/* 微信客服弹层卡片:标题、二维码、电话、关闭分层排布 */
+.wx-popup-card {
+	width: 620upx;
+	max-width: 86vw;
+	background: #ffffff;
+	border-radius: 24upx;
+	padding: 48upx 40upx 40upx;
+	box-sizing: border-box;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	box-shadow: 0 12upx 40upx rgba(0, 0, 0, 0.12);
+}
+
+.wx-popup-title {
+	font-size: 32upx;
+	font-weight: 700;
+	color: #222;
+	line-height: 1.4;
+	text-align: center;
+}
+
+.wx-popup-qr-wrap {
+	width: 420upx;
+	margin-top: 36upx;
+	padding: 20upx;
+	box-sizing: border-box;
+	background: #f7f8fa;
+	border-radius: 16upx;
+	border: 2upx solid #eef0f3;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.wx-popup-qr {
+	width: 100%;
+	display: block;
+}
+
+.wx-popup-phone {
+	width: 100%;
+	margin-top: 36upx;
+	padding: 20upx 24upx;
+	box-sizing: border-box;
+	background: #f7f8fa;
+	border-radius: 12upx;
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	justify-content: center;
+}
+
+.wx-popup-phone-label {
+	font-size: 26upx;
+	color: #888;
+	flex-shrink: 0;
+}
+
+.wx-popup-phone-num {
+	font-size: 30upx;
+	font-weight: 700;
+	color: #222;
+	margin-left: 12upx;
+	flex: 1;
+	min-width: 0;
+}
+
+.wx-popup-call-btn {
+	flex-shrink: 0;
+	margin: 0 0 0 16upx;
+}
+
+.wx-popup-close-btn {
+	width: 100%;
+	margin-top: 40upx;
+	box-sizing: border-box;
+}
 .billing_box_bg {
 .billing_box_bg {
 	height: 100%;
 	height: 100%;
 	display: flex;
 	display: flex;
@@ -1311,4 +1401,22 @@ export default {
 		line-height: 1;
 		line-height: 1;
 	}
 	}
 }
 }
+
+/* 底部右侧客服浮钮:白底默认色图标,淡绿描边 */
+.wx-service-float {
+	position: fixed;
+	bottom: 170upx;
+	right: 40upx;
+	width: 84upx;
+	height: 84upx;
+	border-radius: 50%;
+	background: #ffffff;
+	border: 2upx solid #b7ebc9;
+	box-sizing: border-box;
+	box-shadow: 0 4upx 16upx rgba(0, 0, 0, 0.12);
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	z-index: 99;
+}
 </style>
 </style>

Разница между файлами не показана из-за своего большого размера
+ 20 - 28
hdApp/src/static/svg-icons-lib.js


Некоторые файлы не были показаны из-за большого количества измененных файлов