Merge branch 'zhongqi-delivery' of git.huaml.com:zhh/front-end into zhongqi-delivery

ghsApp/src/admin/cg/code.vue

@@ -9,7 +9,7 @@
     </view>
 
     <view class="confirm-btn">
-      <button class="admin-button-com big blue" style="width:60vw;" @click="startRenew(2,160)">购买音响 ¥160</button>
+      <button class="admin-button-com big blue" style="width:60vw;" @click="startRenew(2,165)">购买音响 ¥165</button>
     </view>
 
     <view style="margin-top:30upx;text-align:center;margin-bottom:30upx;">

ghsApp/src/admin/delivery/allDelivery.vue

@@ -63,26 +63,28 @@
       <TimePicker ref="timePicker" @confirm="handleTimeConfirm" />
       <view class="form-row">
         <view class="form-label">备注</view>
-        <view class="remark-action" @click="openRemarkModal">
-          <text :class="{ placeholder: !remark }">{{ remark || '请填写备注信息' }}</text>
-          <zui-svg-icon icon="general-arrow-right" :width="16" :height="16" color="#333" />
-        </view>
+        <input 
+          v-model="remark" 
+          type="text"
+          placeholder="填写备注信息" 
+          maxlength="200"
+          class="remark-input"
+        />
       </view>
     </view>
 
     <!-- 平台运力 -->
-    <view class="platform-delivery-list">
-      <!-- 列表头部 -->
-      <view class="list-header">
-        <view class="header-left">
-          <text class="header-icon">🚚</text>
-          <text class="header-title">平台运力</text>
-        </view>
-        <button class="load-btn" :class="{ loading: isLoadingDelivery }" :disabled="isLoadingDelivery" @click="handleLoadDelivery">
-          {{ isLoadingDelivery ? '加载中...' : '加载运力' }}
-        </button>
+    <view class="list-header">
+      <view class="header-left">
+        <text class="header-icon">🚚</text>
+        <text class="header-title">运力</text>
       </view>
-      
+      <button class="load-btn" :class="{ loading: isLoadingDelivery }" :disabled="isLoadingDelivery" @click="handleLoadDelivery">
+        {{ isLoadingDelivery ? '加载中...' : '加载运力' }}
+      </button>
+    </view>
+
+    <view class="platform-delivery-list">
       <!-- 跑腿列表 -->
       <!-- 遍历deliveryList -->
       <view class="delivery-item" v-for="(item, index) in deliveryList" :key="index" :class="{ active: selectedDelivery === item.name, disabled: !item.isAble }" @click="selectDelivery(item)">
@@ -111,28 +113,6 @@
       </view>
     </view>
 
-    <!-- 备注输入弹窗 -->
-    <view class="remark-modal" v-if="showRemarkModal" @click="closeRemarkModal">
-      <view class="modal-content" @click.stop>
-        <view class="modal-header">
-          <text class="modal-title">填写备注信息</text>
-        </view>
-        <view class="modal-body">
-          <textarea 
-            v-model="tempRemark" 
-            placeholder="请输入备注信息" 
-            maxlength="200"
-            :auto-height="true"
-            class="remark-textarea"
-          />
-          <view class="char-count">{{ tempRemark.length }}/200</view>
-        </view>
-        <view class="modal-footer">
-          <button class="modal-btn cancel-btn" @click="closeRemarkModal">取消</button>
-          <button class="modal-btn confirm-btn" @click="confirmRemark">确认</button>
-        </view>
-      </view>
-    </view>
 
     <!-- 底部固定区 -->
     <view class="footer-fixed">
@@ -143,7 +123,6 @@
         </view>
         <view class="sub-text">
           <text>实际价格以支付金额为准</text>
-          <text class="detail-btn"> 明细<text class="arrow-down">⌄</text></text>
         </view>
       </view>
       <button class="submit-btn" @click="submitOrder">立即下单</button>
@@ -180,9 +159,6 @@ export default {
             value: dayjs().format('YYYY-MM-DD HH:mm'),
         },
         remark: '',
-        // 备注弹窗相关
-        showRemarkModal: false,
-        tempRemark: '',
         // 用于保存表单的旧值，用于判断是否变动
         oldFormData: {
           weight: 1,
@@ -374,29 +350,6 @@ export default {
       // 取件时间修改后自动加载运力
       this.handleLoadDelivery();
     },
-    openRemarkModal() {
-      // 打开弹窗时，将当前备注内容赋值给临时变量
-      this.tempRemark = this.remark;
-      this.showRemarkModal = true;
-    },
-    closeRemarkModal() {
-      this.showRemarkModal = false;
-      this.tempRemark = '';
-    },
-    confirmRemark() {
-      // 保存旧的备注值
-      const oldRemark = this.remark;
-      // 更新备注
-      this.remark = this.tempRemark;
-      // 关闭弹窗
-      this.showRemarkModal = false;
-      this.tempRemark = '';
-      
-      // 如果有输入内容（不为空且不是纯空格），则自动执行加载运力
-      if (this.remark && this.remark.trim()) {
-        this.handleLoadDelivery();
-      }
-    },
     handleLoadDelivery() {
       // 校验重量是否填写
       if (!this.weight || Number(this.weight) <= 0) {
@@ -491,8 +444,11 @@ export default {
 <style lang="scss" scoped>
 .delivery-container {
   background-color: #f9fbfc;
-  min-height: 100vh;
+  height: 100vh;
   padding-bottom: 150upx;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
 }
 
 /* 地址选择 */
@@ -502,6 +458,7 @@ export default {
   border-radius: 12upx;
   border: 2upx solid #f0f0f0;
   overflow: hidden;
+  flex-shrink: 0;
 
   .address-item {
     display: flex;
@@ -568,7 +525,7 @@ export default {
 /* 下单时间 */
 .order-time-section {
   display: flex;
-  flex-direction: column; /* Changed to column */
+  flex-direction: column;
   background-color: white;
   margin: 0 20upx;
   padding: 20upx;
@@ -577,6 +534,7 @@ export default {
   color: #333333;
   margin-bottom: 20upx;
   border: 2upx solid #f5f5f5;
+  flex-shrink: 0;
 
   .form-row {
     display: flex;
@@ -620,21 +578,24 @@ export default {
     }
   }
 
-  .remark-action {
-    color: #3385FF;
-    display: flex;
-    align-items: center;
-    font-size: 28upx;
+  .remark-input {
     flex: 1;
-    justify-content: flex-end;
+    height: 56upx;
+    padding: 0 16upx;
+    font-size: 28upx;
+    color: #333333;
+    background-color: transparent;
+    border: none;
+    border-bottom: 1upx solid #f0f0f0;
+    border-radius: 0;
+    box-sizing: border-box;
+    text-align: right;
+    line-height: 56upx;
     
-    text {
-      color: #333333;
-      margin-right: 8upx;
-      
-      &.placeholder {
-        color: #999999;
-      }
+    &::placeholder {
+      color: #999999;
+      font-size: 28upx;
+      line-height: 56upx;
     }
   }
   .weight-input-wrapper {
@@ -704,66 +665,74 @@ export default {
   }
 }
 
-/* 平台运力与快递列表 */
-.platform-delivery-list {
-  margin: 0 20upx 60upx;
-  background-color: white;
-  border-radius: 12upx;
-  overflow: hidden;
+/* 列表头部 - 固定不滚动 */
+.list-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 20upx;
+  background-color: #f0f7ff;
+  margin: 0 20upx;
+  margin-bottom: 0;
   border: 1upx solid #f0f0f0;
+  border-radius: 12upx 12upx 0 0;
+  flex-shrink: 0;
 
-  .list-header {
+  .header-left {
     display: flex;
     align-items: center;
-    justify-content: space-between;
-    padding: 20upx;
-    background-color: #f0f7ff;
-    border-bottom: 1upx solid #e0e0e0;
-
-    .header-left {
-      display: flex;
-      align-items: center;
-    }
+  }
 
-    .header-icon {
-      font-size: 32upx;
-      margin-right: 16upx;
-    }
+  .header-icon {
+    font-size: 32upx;
+    margin-right: 16upx;
+  }
 
-    .header-title {
-      font-size: 28upx;
-      font-weight: bold;
-      color: #3385FF;
-    }
+  .header-title {
+    font-size: 28upx;
+    font-weight: bold;
+    color: #3385FF;
+  }
 
-    .load-btn {
-      padding: 8upx 20upx;
-      font-size: 28upx;
-      color: #3385FF;
-      background-color: white;
-      border: 1upx solid #3385FF;
-      border-radius: 20upx;
-      line-height: 1.5;
-      height: auto;
-      margin: 0;
-      transition: all 0.3s;
+  .load-btn {
+    padding: 8upx 20upx;
+    font-size: 28upx;
+    color: #3385FF;
+    background-color: white;
+    border: 1upx solid #3385FF;
+    border-radius: 20upx;
+    line-height: 1.5;
+    height: auto;
+    margin: 0;
+    transition: all 0.3s;
 
-      &:active {
-        background-color: #3385FF;
-        color: white;
-      }
+    &:active {
+      background-color: #3385FF;
+      color: white;
+    }
 
-      &.loading {
-        opacity: 0.7;
-        pointer-events: none;
-      }
+    &.loading {
+      opacity: 0.7;
+      pointer-events: none;
+    }
 
-      &:disabled {
-        opacity: 0.7;
-        cursor: not-allowed;
-      }
+    &:disabled {
+      opacity: 0.7;
+      cursor: not-allowed;
     }
   }
+}
+
+/* 平台运力与快递列表 */
+.platform-delivery-list {
+  margin: 0 20upx 20upx;
+  background-color: white;
+  border-radius: 0 0 12upx 12upx;
+  border: 1upx solid #f0f0f0;
+  border-top: none;
+  flex: 1.5;
+  overflow-y: auto;
+  overflow-x: hidden;
 
   .no-delivery-list {
     padding: 50upx 40upx;
@@ -1025,85 +994,4 @@ export default {
     justify-content: center;
   }
 }
-
-/* 备注输入弹窗 */
-.remark-modal {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: rgba(0, 0, 0, 0.5);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  z-index: 9999;
-
-  .modal-content {
-    width: 600upx;
-    background-color: white;
-    border-radius: 16upx;
-    overflow: hidden;
-  }
-
-  .modal-header {
-    padding: 30upx 30upx 20upx;
-    border-bottom: 1upx solid #f0f0f0;
-
-    .modal-title {
-      font-size: 32upx;
-      font-weight: bold;
-      color: #333333;
-    }
-  }
-
-  .modal-body {
-    padding: 30upx;
-
-    .remark-textarea {
-      width: 100%;
-      min-height: 200upx;
-      padding: 20upx;
-      font-size: 28upx;
-      color: #333333;
-      background-color: #f9f9f9;
-      border-radius: 8upx;
-      border: 1upx solid #e0e0e0;
-      box-sizing: border-box;
-    }
-
-    .char-count {
-      margin-top: 10upx;
-      font-size: 24upx;
-      color: #999999;
-      text-align: right;
-    }
-  }
-
-  .modal-footer {
-    display: flex;
-    border-top: 1upx solid #f0f0f0;
-
-    .modal-btn {
-      flex: 1;
-      height: 90upx;
-      line-height: 90upx;
-      font-size: 30upx;
-      border: none;
-      background-color: transparent;
-      margin: 0;
-      padding: 0;
-
-      &.cancel-btn {
-        color: #666666;
-        border-right: 1upx solid #f0f0f0;
-      }
-
-      &.confirm-btn {
-        color: #3385FF;
-        font-weight: 500;
-      }
-    }
-  }
-}
 </style>

ghsApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "销花宝",
     "appid" : "__UNI__BD781B0",
     "description" : "鲜花批发销售管理系统",
-    "versionName" : "1.2.66",
-    "versionCode" : 1266,
+    "versionName" : "1.2.68",
+    "versionCode" : 1268,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

ghsPad/src/pages/home/components/orderInfo.vue

@@ -62,7 +62,6 @@
     <view class="button-area">
       <view :class="[orderInfo.status==1 || orderInfo.status==5 ? '' : 'active']" @click="printFn(orderInfo)">打印({{orderInfo.printNum}})</view>
       <view :class="[orderInfo.status==1 ? 'active' : '']" @click="cancelShow()">取消</view>
-      <view class="active" @click="upgradeApp()">更新</view>
     </view>
 
     <!-- 选数量金额 -->
@@ -150,13 +149,7 @@ export default {
 
 	},
   methods:{
-		upgradeApp(){
-      // #ifdef APP-PLUS
-      plus.runtime.openURL('http://www.wixhb.com/main/app')
-      // #endif
-		},
     confirmLock(){
-
     },
     confirmWastageSelectNum(){
 

ghsPad/src/pages/home/xj.vue

@@ -18,7 +18,8 @@
 					</view>
 					<view style="width:100%;text-align: center;font-size:20upx;margin-top:20upx;" @click="goBA()">
 						<view>闽CIP备15017325号-12A</view>
-						<view>版本号 {{version}}</view>
+						<view style="margin-top:15upx;">版本号 {{version}}</view>
+						<view style="margin-top:15upx;" @click="upgradeApp()">最新版本</view>
 					</view>
 				</view>
 				<view class="custom">
@@ -80,6 +81,11 @@ export default {
 		// #endif
 	},
 	methods: {
+		upgradeApp(){
+			// #ifdef APP-PLUS
+			plus.runtime.openURL('http://www.wixhb.com/main/app')
+			// #endif
+		},
 		addCustom() {
 			let that = this
 			if(this.$util.isEmpty(this.form.name1)){
@@ -188,11 +194,11 @@ export default {
 		.cash{
 			font-size:35upx;
 			margin-left:25upx;
-			margin-top:30upx;
+			margin-top:20upx;
 		}
 		.draw{
 			margin-top:30upx;
-			margin-left:25upx;
+			margin-left:15upx;
 			.draw-input{
 				width:160upx;
 				height:50upx;
@@ -204,7 +210,7 @@ export default {
 		}
 		.save{
 			margin-top:30upx;
-			margin-left:25upx;
+			margin-left:15upx;
 			.save-input{
 				width:160upx;
 				height:50upx;

hdApp/src/admin/billing/affirmGhs.vue

@@ -254,15 +254,15 @@
 						<view class="tui-title">距离</view>
 						<text v-if="showDistance > 100" style="color: #3385FF">{{ (showDistance/1000).toFixed(1) }}公里</text>
 						<text v-else style="color: #3385FF">{{ showDistance }} 米</text>
+						<text v-if="showDeliveryPolicy" class="delivery-policy-link" @click="showDeliveryPolicyModal">
+							免跑腿费条件
+						</text>
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false" v-if="displaySendCost == true">
 						<view class="tui-title">跑腿费</view>
 						<view>
-							<text :class="isFreeDelivery ? 'delivery-price-free' : 'delivery-price-normal'">¥ {{ form.sendCost }}</text>
-							<text v-if="isFreeDelivery" class="free-delivery-tag">【免跑腿费】</text>
-							<text v-if="showDeliveryPolicy" class="delivery-policy-link" @click="showDeliveryPolicyModal">
-								免费配送条件
-							</text>
+							<text :class="isFreeDelivery ? 'delivery-price-free' : 'delivery-price-normal'">¥{{ form.sendCost }}</text>
+							<text v-if="isFreeDelivery" class="free-delivery-tag">¥0【免跑腿费】</text>
 						</view>
 					</tui-list-cell>
 
@@ -1535,8 +1535,9 @@ export default {
 
 .delivery-policy-link {
 	color: rgb(201, 52, 52);
-	font-size: 28upx;
-	margin-left: 12upx;
+	font-size: 30upx;
+	margin-left: 30upx;
+	font-weight:bold;
 	text-decoration: underline;
 }
 

hdApp/src/admin/billing/result.vue

@@ -2,10 +2,13 @@
   <view class="app-content">
     <appResult>
 		<button class="admin-button-com blue big" @click="gotoDetail">订单详情</button>
-
 		<button class="admin-button-com blue big" @click="sendWork" v-if="orderInfo.hasWork!=1">通知制作</button>
-
 		<button class="admin-button-com big" @click="gotoPlace">返回</button>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<ad-custom unit-id="adunit-b3f48f1b6c1a39ff"></ad-custom>
+		<!-- #endif -->
+
     </appResult>
   </view>
 </template>
@@ -54,54 +57,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .admin-button-com {
-	margin-bottom:60upx;
-	width: 100%;
-}
-.zuhe-box{
-	width: 100%;
-	padding:  0 20upx;
-	margin-bottom: 20upx;
-	background-color: #fff;
-	.zuhe-remark{
-		color: #333;
-		font-size: 32upx;
-		font-weight: 700;
-		line-height: 88upx;
-	}
-	.zuhe-center{
-		font-size: 28upx;
-		height: 90upx;
-		box-sizing: border-box;
-		.zuhe-title{
-			color: #666;
-		}
-		&>input{
-			border: 1px solid #eee!important;
-			border-radius: 5upx!important;
-		}
-		.zuhe-val{
-			position: relative;
-			width: 70%;
-			height: 60upx;
-			padding: 10upx;
-			color: #333;
-			border: 1px solid #868686;
-			border: none;
-			&.active:before {
-				content: ' ';
-				height: 22upx;
-				width: 22upx;
-				border-width: 2upx 2upx 0 0;
-				border-color: #868686;
-				border-style: solid;
-				-webkit-transform: matrix(0.5, 0.5, -0.5, 0.5, 0, 0);
-				transform: matrix(0.5, 0.5, -0.5, 0.5, 0, 0);
-				position: absolute;
-				top: 50%;
-				margin-top: -12upx;
-				right: 30upx;
-			}
-		}
-	}
+	width: 60%;
+	margin-bottom:30upx;
 }
 </style>

hdApp/src/admin/cg/code.vue

@@ -9,7 +9,7 @@
     </view>
 
     <view class="confirm-btn">
-      <button class="admin-button-com big blue" style="width:60vw;">购买音响 ¥160</button>
+      <button class="admin-button-com big blue" style="width:60vw;">购买音响 ¥165</button>
     </view>
 
     <view style="margin-top:30upx;text-align:center;margin-bottom:30upx;">

hdApp/src/admin/delivery/allDelivery.vue

@@ -63,26 +63,28 @@
       <TimePicker ref="timePicker" @confirm="handleTimeConfirm" />
       <view class="form-row">
         <view class="form-label">备注</view>
-        <view class="remark-action" @click="openRemarkModal">
-          <text :class="{ placeholder: !remark }">{{ remark || '请填写备注信息' }}</text>
-          <zui-svg-icon icon="general-arrow-right" :width="16" :height="16" color="#333" />
-        </view>
+        <input 
+          v-model="remark" 
+          type="text"
+          placeholder="填写备注信息" 
+          maxlength="200"
+          class="remark-input"
+        />
       </view>
     </view>
 
     <!-- 平台运力 -->
-    <view class="platform-delivery-list">
-      <!-- 列表头部 -->
-      <view class="list-header">
-        <view class="header-left">
-          <text class="header-icon">🚚</text>
-          <text class="header-title">平台运力</text>
-        </view>
-        <button class="load-btn" :class="{ loading: isLoadingDelivery }" :disabled="isLoadingDelivery" @click="handleLoadDelivery">
-          {{ isLoadingDelivery ? '加载中...' : '加载运力' }}
-        </button>
+    <view class="list-header">
+      <view class="header-left">
+        <text class="header-icon">🚚</text>
+        <text class="header-title">运力</text>
       </view>
-      
+      <button class="load-btn" :class="{ loading: isLoadingDelivery }" :disabled="isLoadingDelivery" @click="handleLoadDelivery">
+        {{ isLoadingDelivery ? '加载中...' : '加载运力' }}
+      </button>
+    </view>
+
+    <view class="platform-delivery-list">
       <!-- 跑腿列表 -->
       <!-- 遍历deliveryList -->
       <view class="delivery-item" v-for="(item, index) in deliveryList" :key="index" :class="{ active: selectedDelivery === item.name, disabled: !item.isAble }" @click="selectDelivery(item)">
@@ -106,28 +108,6 @@
       </view>
     </view>
 
-    <!-- 备注输入弹窗 -->
-    <view class="remark-modal" v-if="showRemarkModal" @click="closeRemarkModal">
-      <view class="modal-content" @click.stop>
-        <view class="modal-header">
-          <text class="modal-title">填写备注信息</text>
-        </view>
-        <view class="modal-body">
-          <textarea 
-            v-model="tempRemark" 
-            placeholder="请输入备注信息" 
-            maxlength="200"
-            :auto-height="true"
-            class="remark-textarea"
-          />
-          <view class="char-count">{{ tempRemark.length }}/200</view>
-        </view>
-        <view class="modal-footer">
-          <button class="modal-btn cancel-btn" @click="closeRemarkModal">取消</button>
-          <button class="modal-btn confirm-btn" @click="confirmRemark">确认</button>
-        </view>
-      </view>
-    </view>
 
     <!-- 底部固定区 -->
     <view class="footer-fixed">
@@ -138,7 +118,6 @@
         </view>
         <view class="sub-text">
           <text>实际价格以支付金额为准</text>
-          <text class="detail-btn"> 明细<text class="arrow-down">⌄</text></text>
         </view>
       </view>
       <button class="submit-btn" @click="submitOrder">立即下单</button>
@@ -175,9 +154,6 @@ export default {
             value: dayjs().format('YYYY-MM-DD HH:mm'),
         },
         remark: '',
-        // 备注弹窗相关
-        showRemarkModal: false,
-        tempRemark: '',
         // 用于保存表单的旧值，用于判断是否变动
         oldFormData: {
           weight: 1,
@@ -367,29 +343,6 @@ export default {
       // 取件时间修改后自动加载运力
       this.handleLoadDelivery();
     },
-    openRemarkModal() {
-      // 打开弹窗时，将当前备注内容赋值给临时变量
-      this.tempRemark = this.remark;
-      this.showRemarkModal = true;
-    },
-    closeRemarkModal() {
-      this.showRemarkModal = false;
-      this.tempRemark = '';
-    },
-    confirmRemark() {
-      // 保存旧的备注值
-      const oldRemark = this.remark;
-      // 更新备注
-      this.remark = this.tempRemark;
-      // 关闭弹窗
-      this.showRemarkModal = false;
-      this.tempRemark = '';
-      
-      // 如果有输入内容（不为空且不是纯空格），则自动执行加载运力
-      if (this.remark && this.remark.trim()) {
-        this.handleLoadDelivery();
-      }
-    },
     handleLoadDelivery() {
       // 校验重量是否填写
       if (!this.weight || Number(this.weight) <= 0) {
@@ -480,8 +433,11 @@ export default {
 <style lang="scss" scoped>
 .delivery-container {
   background-color: #f9fbfc;
-  min-height: 100vh;
+  height: 100vh;
   padding-bottom: 150upx;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
 }
 
 /* 地址选择 */
@@ -491,6 +447,7 @@ export default {
   border-radius: 12upx;
   border: 2upx solid #f0f0f0;
   overflow: hidden;
+  flex-shrink: 0;
 
   .address-item {
     display: flex;
@@ -557,7 +514,7 @@ export default {
 /* 下单时间 */
 .order-time-section {
   display: flex;
-  flex-direction: column; /* Changed to column */
+  flex-direction: column;
   background-color: white;
   margin: 0 20upx;
   padding: 20upx;
@@ -566,6 +523,7 @@ export default {
   color: #333333;
   margin-bottom: 20upx;
   border: 2upx solid #f5f5f5;
+  flex-shrink: 0;
 
   .form-row {
     display: flex;
@@ -609,21 +567,24 @@ export default {
     }
   }
 
-  .remark-action {
-    color: #3385FF;
-    display: flex;
-    align-items: center;
-    font-size: 28upx;
+  .remark-input {
     flex: 1;
-    justify-content: flex-end;
+    height: 56upx;
+    padding: 0 16upx;
+    font-size: 28upx;
+    color: #333333;
+    background-color: transparent;
+    border: none;
+    border-bottom: 1upx solid #f0f0f0;
+    border-radius: 0;
+    box-sizing: border-box;
+    text-align: right;
+    line-height: 56upx;
     
-    text {
-      color: #333333;
-      margin-right: 8upx;
-      
-      &.placeholder {
-        color: #999999;
-      }
+    &::placeholder {
+      color: #999999;
+      font-size: 28upx;
+      line-height: 56upx;
     }
   }
   .weight-input-wrapper {
@@ -693,66 +654,74 @@ export default {
   }
 }
 
-/* 平台运力与快递列表 */
-.platform-delivery-list {
-  margin: 0 20upx 60upx;
-  background-color: white;
-  border-radius: 12upx;
-  overflow: hidden;
+/* 列表头部 - 固定不滚动 */
+.list-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 20upx;
+  background-color: #f0f7ff;
+  margin: 0 20upx;
+  margin-bottom: 0;
   border: 1upx solid #f0f0f0;
+  border-radius: 12upx 12upx 0 0;
+  flex-shrink: 0;
 
-  .list-header {
+  .header-left {
     display: flex;
     align-items: center;
-    justify-content: space-between;
-    padding: 20upx;
-    background-color: #f0f7ff;
-    border-bottom: 1upx solid #e0e0e0;
-
-    .header-left {
-      display: flex;
-      align-items: center;
-    }
+  }
 
-    .header-icon {
-      font-size: 32upx;
-      margin-right: 16upx;
-    }
+  .header-icon {
+    font-size: 32upx;
+    margin-right: 16upx;
+  }
 
-    .header-title {
-      font-size: 28upx;
-      font-weight: bold;
-      color: #3385FF;
-    }
+  .header-title {
+    font-size: 28upx;
+    font-weight: bold;
+    color: #3385FF;
+  }
 
-    .load-btn {
-      padding: 8upx 20upx;
-      font-size: 28upx;
-      color: #3385FF;
-      background-color: white;
-      border: 1upx solid #3385FF;
-      border-radius: 20upx;
-      line-height: 1.5;
-      height: auto;
-      margin: 0;
-      transition: all 0.3s;
+  .load-btn {
+    padding: 8upx 20upx;
+    font-size: 28upx;
+    color: #3385FF;
+    background-color: white;
+    border: 1upx solid #3385FF;
+    border-radius: 20upx;
+    line-height: 1.5;
+    height: auto;
+    margin: 0;
+    transition: all 0.3s;
 
-      &:active {
-        background-color: #3385FF;
-        color: white;
-      }
+    &:active {
+      background-color: #3385FF;
+      color: white;
+    }
 
-      &.loading {
-        opacity: 0.7;
-        pointer-events: none;
-      }
+    &.loading {
+      opacity: 0.7;
+      pointer-events: none;
+    }
 
-      &:disabled {
-        opacity: 0.7;
-        cursor: not-allowed;
-      }
+    &:disabled {
+      opacity: 0.7;
+      cursor: not-allowed;
     }
   }
+}
+
+/* 平台运力与快递列表 */
+.platform-delivery-list {
+  margin: 0 20upx 20upx;
+  background-color: white;
+  border-radius: 0 0 12upx 12upx;
+  border: 1upx solid #f0f0f0;
+  border-top: none;
+  flex: 1.5;
+  overflow-y: auto;
+  overflow-x: hidden;
 
   .no-delivery-list {
     padding: 50upx 40upx;
@@ -1014,85 +983,4 @@ export default {
     justify-content: center;
   }
 }
-
-/* 备注输入弹窗 */
-.remark-modal {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: rgba(0, 0, 0, 0.5);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  z-index: 9999;
-
-  .modal-content {
-    width: 600upx;
-    background-color: white;
-    border-radius: 16upx;
-    overflow: hidden;
-  }
-
-  .modal-header {
-    padding: 30upx 30upx 20upx;
-    border-bottom: 1upx solid #f0f0f0;
-
-    .modal-title {
-      font-size: 32upx;
-      font-weight: bold;
-      color: #333333;
-    }
-  }
-
-  .modal-body {
-    padding: 30upx;
-
-    .remark-textarea {
-      width: 100%;
-      min-height: 200upx;
-      padding: 20upx;
-      font-size: 28upx;
-      color: #333333;
-      background-color: #f9f9f9;
-      border-radius: 8upx;
-      border: 1upx solid #e0e0e0;
-      box-sizing: border-box;
-    }
-
-    .char-count {
-      margin-top: 10upx;
-      font-size: 24upx;
-      color: #999999;
-      text-align: right;
-    }
-  }
-
-  .modal-footer {
-    display: flex;
-    border-top: 1upx solid #f0f0f0;
-
-    .modal-btn {
-      flex: 1;
-      height: 90upx;
-      line-height: 90upx;
-      font-size: 30upx;
-      border: none;
-      background-color: transparent;
-      margin: 0;
-      padding: 0;
-
-      &.cancel-btn {
-        color: #666666;
-        border-right: 1upx solid #f0f0f0;
-      }
-
-      &.confirm-btn {
-        color: #3385FF;
-        font-weight: 500;
-      }
-    }
-  }
-}
 </style>

hdApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜",
     "appid" : "__UNI__4079DC1",
     "description" : "花店管家婆",
-    "versionName" : "2.1.8",
-    "versionCode" : 218,
+    "versionName" : "2.2.0",
+    "versionCode" : 220,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

hdPad/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜收银",
     "appid" : "__UNI__F6E7EA0",
     "description" : "花掌柜收银",
-    "versionName" : "1.8.8",
-    "versionCode" : 188,
+    "versionName" : "1.9.0",
+    "versionCode" : 190,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

hdPad/src/pages/home/xj.vue

@@ -15,9 +15,10 @@
 					<input v-model="saveCash" type="digit" class="save-input" @focus="saveCash=''" placeholder="金额" /> 
 					<text @click="inAmount()" style="margin-left:30upx;font-size:34upx;">存入</text>
 				</view>
-				<view style="width:48%;text-align:center;font-size:20upx;margin-top:50upx;" @click="goBA()">
+				<view style="width:48%;text-align:center;font-size:20upx;margin-top:20upx;" @click="goBA()">
 					<view>闽CIP备15017325号-11A</view>
-					<view>版本号 {{version}}</view>
+					<view style="margin-top:15upx;">版本号 {{version}}</view>
+					<view style="margin-top:15upx;" @click="upgradeApp()">最新版本</view>
 				</view>
             </view>
         </view>
@@ -64,6 +65,11 @@ export default {
 		// #endif
 	},
 	methods: {
+		upgradeApp(){
+			// #ifdef APP-PLUS
+			plus.runtime.openURL('http://www.wixhb.com/main/app')
+			// #endif
+		},
 		init(){
 
 		},
@@ -144,10 +150,10 @@ export default {
 		.cash{
 			font-size:35upx;
 			margin-left:50upx;
-			margin-top:50upx;
+			margin-top:20upx;
 		}
 		.draw{
-			margin-top:50upx;
+			margin-top:15upx;
 			margin-left:50upx;
 			.draw-input{
 				width:160upx;
@@ -159,7 +165,7 @@ export default {
 			}
 		}
 		.save{
-			margin-top:50upx;
+			margin-top:15upx;
 			margin-left:50upx;
 			.save-input{
 				width:160upx;

mallApp/src/components/app-delivery.vue

@@ -65,8 +65,8 @@
 			<tui-list-cell class="line-cell" :hover="false">
 				<view class="tui-title">跑腿费</view>
 				<view>
-					<text :class="isFreeDelivery ? 'delivery-price-free' : 'delivery-price-normal'">¥ {{ isFreeDelivery ? 0 : (selectedDeliveryData ? selectedDeliveryData.priceNumber : 0) }}</text>
-					<text v-if="isFreeDelivery" class="free-delivery-tag">【免跑腿费】</text>
+					<text :class="isFreeDelivery ? 'delivery-price-free' : 'delivery-price-normal'">¥{{ isFreeDelivery ? 0 : (selectedDeliveryData ? selectedDeliveryData.priceNumber : 0) }}</text>
+					<text v-if="isFreeDelivery" class="free-delivery-tag">¥0【免跑腿费】</text>
 				</view>
 			</tui-list-cell>
 		</div>

mallApp/src/pages/billing/affirmGhs.vue

@@ -136,8 +136,8 @@
 						<tui-list-cell class="line-cell" :hover="false" v-if="displaySendCost == true">
 							<view class="tui-title">跑腿费</view>
 							<view>
-								<text :class="isFreeDelivery ? 'delivery-price-free' : 'delivery-price-normal'">¥ {{ form.sendCost }}</text>
-								<text v-if="isFreeDelivery" class="free-delivery-tag">【免跑腿费】</text>
+								<text :class="isFreeDelivery ? 'delivery-price-free' : 'delivery-price-normal'">¥{{ form.sendCost }}</text>
+								<text v-if="isFreeDelivery" class="free-delivery-tag">¥0【免跑腿费】</text>
 							</view>
 						</tui-list-cell>
 					</block>

mallApp/src/pages/callback/paySuccess.vue

@@ -15,8 +15,7 @@
 
           <!-- #ifdef MP-WEIXIN -->
           <view style="width:100%;height:10upx;background-color:white;margin-top:60upx;"></view>
-          <ad-custom unit-id="adunit-510957a20b72a06b" v-if="currentEnv=='production'"></ad-custom>
-          <ad-custom unit-id="adunit-6a8fe4bf5e96ffba" v-else></ad-custom>
+          <ad-custom unit-id="adunit-510957a20b72a06b"></ad-custom>
           <!-- #endif -->
 
       </div>

mallApp/src/pages/order/components/app-delivery.vue

@@ -70,8 +70,8 @@
           <tui-list-cell class="line-cell" :hover="false">
               <view class="tui-title">跑腿费</view>
               <view class="tui-input">
-                <text :class="isFreeDelivery ? 'delivery-price-free' : 'delivery-price-normal'">¥ {{ form.sendCost }}</text>
-                <text v-if="isFreeDelivery" class="free-delivery-tag">【免跑腿费】</text>
+                <text :class="isFreeDelivery ? 'delivery-price-free' : 'delivery-price-normal'">¥{{ form.sendCost }}</text>
+                <text v-if="isFreeDelivery" class="free-delivery-tag">¥0【免跑腿费】</text>
                 <text v-if="showDeliveryPolicy" class="delivery-policy-link" @click="showDeliveryPolicyModal">
 									<text class="iconfont iconchangjianwentixiangguanwenti2 policy-icon"></text>包配送政策
 								</text>

开发http/ghsApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "销花宝",
     "appid" : "__UNI__BD781B0",
     "description" : "鲜花批发销售管理系统",
-    "versionName" : "1.2.66",
-    "versionCode" : 1266,
+    "versionName" : "1.2.68",
+    "versionCode" : 1268,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

开发http/hdApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜",
     "appid" : "__UNI__4079DC1",
     "description" : "花店管家婆",
-    "versionName" : "2.1.8",
-    "versionCode" : 218,
+    "versionName" : "2.2.0",
+    "versionCode" : 220,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

开发http/hdPad/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜收银",
     "appid" : "__UNI__F6E7EA0",
     "description" : "花掌柜收银",
-    "versionName" : "1.8.8",
-    "versionCode" : 188,
+    "versionName" : "1.9.0",
+    "versionCode" : 190,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

开发https/ghsApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "销花宝",
     "appid" : "__UNI__BD781B0",
     "description" : "鲜花批发销售管理系统",
-    "versionName" : "1.2.66",
-    "versionCode" : 1266,
+    "versionName" : "1.2.68",
+    "versionCode" : 1268,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

开发https/hdApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜",
     "appid" : "__UNI__4079DC1",
     "description" : "花店管家婆",
-    "versionName" : "2.1.8",
-    "versionCode" : 218,
+    "versionName" : "2.2.0",
+    "versionCode" : 220,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

开发https/hdPad/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜收银",
     "appid" : "__UNI__F6E7EA0",
     "description" : "花掌柜收银",
-    "versionName" : "1.8.8",
-    "versionCode" : 188,
+    "versionName" : "1.9.0",
+    "versionCode" : 190,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

线上/ghsApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "销花宝",
     "appid" : "__UNI__BD781B0",
     "description" : "鲜花批发销售管理系统",
-    "versionName" : "1.2.66",
-    "versionCode" : 1266,
+    "versionName" : "1.2.68",
+    "versionCode" : 1268,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

线上/hdApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜",
     "appid" : "__UNI__4079DC1",
     "description" : "花店管家婆",
-    "versionName" : "2.1.8",
-    "versionCode" : 218,
+    "versionName" : "2.2.0",
+    "versionCode" : 220,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

线上/hdPad/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜收银",
     "appid" : "__UNI__F6E7EA0",
     "description" : "花掌柜收银",
-    "versionName" : "1.8.8",
-    "versionCode" : 188,
+    "versionName" : "1.9.0",
+    "versionCode" : 190,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {