Merge branch 'master' into zhongqi-birthDay

hdApp/src/pagesPurchase/components/item.vue

@@ -17,9 +17,13 @@
 				<view class="kc num-open_bx flex-space">
 					<view>
 						<view class="flex-space" v-if="Number(info.discountPrice)>0" style="position:absolute;top:14upx;">
-							<view style="padding:2upx 10upx 5upx 10upx;text-align: center;color: red;border: 1px solid red;line-height: 1;font-size: 20upx">
+							<view style="padding:6upx 5upx 6upx 5upx;text-align: center;color: red;border: 1px solid red;line-height: 1;font-size: 24upx">
 								{{parseFloat(((Number(info.discountPrice)/Number(info.prePrice)).toFixed(2)*10).toFixed(1))+'折'}}
 							</view>
+
+							<text v-if="info.ratioType == 0" style="margin-left:6upx;color:#333333;font-size: 26upx;">{{info.ratio}}{{info.smallUnit}}</text>
+							<text v-else style="margin-left:6upx;color:#333333;font-size: 26upx;">若干</text>
+
 						</view>
 						<view class="flex-space" style="color:#333333;position:absolute;top:13upx;" v-else>
 							<block v-if="info.ratioType == 0">

hdApp/src/pagesPurchase/contact.vue

@@ -10,7 +10,7 @@
 
     <!-- 软件公司联系方式说明：避免用户误把花材售后问题发到软件客服 -->
     <view class="software-notice">
-      以下联系方式是软件公司，只提供系统和软件服务咨询，不处理商家花材质量和售后问题。花材质量和售后问题，请按上面图片找商家电话。
+      以下联系方式是软件公司，只提供系统和软件服务咨询，没有处理商家花材质量和售后问题。
     </view>
 
     <view class="section-card contact-card">
@@ -22,11 +22,15 @@
       </view>
       <view class="wechat-list">
         <view class="wechat-item">
-          <view class="wechat-info">
-            <text class="wechat-label">微信</text>
-            <text class="wechat-number">18559200768</text>
+          <view class="qrcode-box">
+            <image
+              class="qrcode-image"
+              :src="`${constant.imgUrl}/shop/contact_mg.jpg`"
+              mode="widthFix"
+              show-menu-by-longpress
+            />
           </view>
-          <button class="admin-button-com middle blue copy-action" @click="copyWechat('18559200768')">复制</button>
+          <view class="qrcode-hint">长按识别二维码</view>
         </view>
       </view>
     </view>
@@ -40,14 +44,19 @@
       </view>
       <view class="wechat-list">
         <view class="wechat-item">
-          <view class="wechat-info">
-            <text class="wechat-label">微信</text>
-            <text class="wechat-number">15280215347</text>
+          <view class="qrcode-box">
+            <image
+              class="qrcode-image"
+              :src="`${constant.imgUrl}/shop/contact_st.jpg`"
+              mode="widthFix"
+              show-menu-by-longpress
+            />
           </view>
-          <button class="admin-button-com middle blue copy-action" @click="copyWechat('15280215347')">复制</button>
+          <view class="qrcode-hint">长按识别二维码</view>
         </view>
       </view>
     </view>
+
   </view>
 </template>
 
@@ -161,10 +170,9 @@ export default {
 
 .wechat-item {
   display: flex;
-  flex-direction: row;
+  flex-direction: column;
   align-items: center;
-  justify-content: space-between;
-  padding: 24upx 28upx;
+  padding: 28upx 24upx 32upx;
   border-radius: 18upx;
   background: #f7faf8;
   margin-top: 20upx;
@@ -174,34 +182,25 @@ export default {
   }
 }
 
-.wechat-info {
-  display: flex;
-  flex-direction: column;
-  flex: 1;
-  min-width: 0;
-  margin-right: 24upx;
-}
-
-.wechat-label {
-  color: #77817c;
-  font-size: 24upx;
-  line-height: 34upx;
-  margin-bottom: 8upx;
+.qrcode-box {
+  width: 100%;
+  max-width: 420upx;
+  border-radius: 16upx;
+  overflow: hidden;
+  border: 1upx solid #eef1ef;
+  background: #fff;
 }
 
-.wechat-number {
-  color: #18251e;
-  font-size: 34upx;
-  font-weight: 600;
-  line-height: 48upx;
-  letter-spacing: 1upx;
-  word-break: break-all;
+.qrcode-image {
+  width: 100%;
+  display: block;
 }
 
-.copy-action {
-  flex-shrink: 0;
-  min-width: 128upx;
-  padding-left: 28upx;
-  padding-right: 28upx;
+.qrcode-hint {
+  margin-top: 20upx;
+  color: black;
+  font-size: 32upx;
+  line-height: 40upx;
+  text-align: center;
 }
 </style>