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

ghsApp/src/admin/cg/code.vue

@@ -3,23 +3,65 @@
     <view class="img_box" style="margin-top:30upx;">
       <image :src="gatherUrl" mode="heightFix" class="img_url"></image>
     </view>
-    <view style="font-size:32upx;text-align: center;margin:30upx 0 5upx 0;">打印尺寸 100mmx150mm</view>
+    <view style="font-size:30upx;text-align: center;margin:30upx 0 5upx 0;">支持信用卡和花呗，打印尺寸100mmx150mm</view>
     <view class="confirm-btn">
       <button class="admin-button-com big blue" style="width:60vw;" @click="downloadImg(gatherUrl)">下载收款码</button>
     </view>
+
+    <view class="confirm-btn">
+      <button class="admin-button-com big blue" style="width:60vw;" @click="startRenew(2,160)">购买音响 ¥160</button>
+    </view>
+
+    <view style="margin-top:30upx;text-align:center;margin-bottom:30upx;">
+      <image :src="laba" mode="widthFix" style="width:640upx;margin:0 auto;border-radius: 10upx;"></image>
+    </view>
+
   </view>
 </template>
 <script>
 import { miniGatheringCode } from '@/api/shop'
+import wexinPay from "@/utils/pay/wxPay"
+import { renewShop,needRemind } from "@/api/renew"
 export default {
   data() {
     return {
-      gatherUrl:''
+      gatherUrl:'',
+      laba: `${this.$constant.hostUrl}/image/horn.jpg`,
     }
   },
   methods: {
     init() {
       this.getImg()
+    },
+		startRenew(type,price){
+            let that = this
+            // #ifdef APP-PLUS
+            that.$msg("APP不能操作，请打开微信小程序操作")
+            // #endif
+            // #ifdef MP-WEIXIN
+            uni.showLoading({mask:true})
+            if(type == 1){
+                if(Number(price) <= 0){
+                    that.$msg("请输入金额")
+                    return false
+                }
+            }
+            this.renewType = type
+            renewShop({price:price,type:type,remark:this.remark}).then(res=>{
+                uni.hideLoading()
+                if(res.code == 1){
+                    wexinPay(res.data, this.getSuccess, this.getError)
+                }
+            })
+            // #endif
+        },
+		getSuccess(){
+			this.$util.pageTo({url:"/admin/shop/renewSuccess?type="+this.renewType,type:2})
+		},
+		getError(){
+        },
+    closeRenew(){
+        uni.navigateBack()
     },
     downloadImg(url){
             // #ifdef APP-PLUS

ghsApp/src/admin/home/apply.vue

@@ -54,7 +54,7 @@ export default {
                         {name: "已下架",img: `${this.$constant.hostUrl}/image/ghs/home/hcgl.png`,url: "/admin/changePrice/outList"},
                         {name: "已删除",img: `${this.$constant.hostUrl}/image/ghs/home/hcgl.png`,url: "/admin/changePrice/stopList"},
                         {name: "采购人管理",img: `${this.$constant.hostUrl}/image/ghs/home/hcgl.png`,url: "/admin/changePrice/changeCgStaff"},
-                        {name: "购买须知",img: `${this.$constant.hostUrl}/image/ghs/home/hcgl.png`,url: "/admin/picText/purchaseGuide"},
+                        {name: "公告",img: `${this.$constant.hostUrl}/image/ghs/home/hcgl.png`,url: "/admin/picText/purchaseGuide"},
                         {name: "图文",img: `${this.$constant.hostUrl}/image/ghs/home/hcgl.png`,url: "/admin/picText/picTextList"},
                     ]
                 },

ghsApp/src/admin/home/workbench.vue

@@ -286,7 +286,7 @@ export default {
 				{name : "盘点", img : "/ghs/home/pandian.png", url : "/pagesStorehouse/inventory/list"},
 				{name : "库存预警", img : "/ghs/home/kcyjs.png", url : "/admin/item/list?warning=1"},
 			],
-			skSrc: `${this.$constant.hostUrl}/image/ghs/home/kj.png`,
+			skSrc: `${this.$constant.hostUrl}/image/ghs/home/kj2.png`,
 			pfSrc: `${this.$constant.hostUrl}/image/ghs/home/pf.jpg`,
 			skSrc3: `${this.$constant.hostUrl}/image/ghs/home/sk33.jpg`,
 			pfSrc3: `${this.$constant.hostUrl}/image/ghs/home/pf3.jpg`,
@@ -1010,7 +1010,7 @@ export default {
 .warning-banner {
 	background-color: #ff6b6b;
 	border-radius: 8upx;
-	margin: 20upx 30upx 20upx 30upx;
+	margin: 20upx 16upx 20upx 16upx;
 	padding: 20upx 24upx;
 	color: #ffffff;
 	font-size: 32upx;

ghsApp/src/admin/item/detail.vue

@@ -437,7 +437,7 @@
 import TuiListCell from "@/components/plugin/list-cell";
 const form = require("@/utils/formValidation.js");
 import { getAllItemClass } from "@/api/item-class";
-import { applyAuth,modifyCgStaff,setLosing,modifyUnit,modifyRatio,modifyWeight,clearLimitBuy } from '@/api/item';
+import { applyAuth,modifyCgStaff,setLosing,modifyUnit,modifyRatio,modifyWeight,clearLimitBuy,changeVirtualStock } from '@/api/item';
 //import { delCpItem,addCpItem } from '@/api/cp'
 import { getAllUnit } from "@/api/unit";
 import { addProduct,updateProduct,getProductDetail,py,print,modifyOnStockFn,delStatusUpdate,changeBelongCost,modifyAvCost,modifyPartAcceptItem } from "@/api/product";
@@ -1062,6 +1062,13 @@ export default {
 		},
     virtualStockChange(value){
       this.form.virtualStock = value
+      if(this.productData.id && Number(this.productData.id)>0){
+        changeVirtualStock({id:this.productData.id,virtualStock:this.form.virtualStock}).then(res=>{
+          if(res.code == 1){
+            this.$msg('修改成功')
+          }
+        })
+      }
     },
     belongCostChange(value){
       let that = this

ghsApp/src/admin/picText/picTextList.vue

@@ -39,7 +39,7 @@
     </view>
 
     <view class="app-footer">
-      <button class="admin-button-com big blue" @click="addPicTextFn">{{ option.type == 3 ? '新增图文' : '新增说明' }}</button>
+      <button class="admin-button-com big blue" @click="addPicTextFn">新增图文</button>
     </view>
   </view>
 </template>

ghsApp/src/admin/picText/purchaseGuide.vue

@@ -16,18 +16,33 @@
       </view>
     </view>
 
-    <!-- 选择 -->
+    <view class="form-section">
+      <view class="form-item textarea-item">
+        <text class="form-label">公告标题</text>
+        <button class="admin-button-com middle blue" style="float: right;" @click="purchaseGuideText=''">清空</button>
+      </view>
+      <view class="textarea-wrapper">
+        <textarea 
+          v-model="purchaseGuideText"
+          class="textarea-input"
+          placeholder="请输入标题，不超过70个字，留空会显示一张图片"
+          :placeholder-style="{ color: '#999999' }"
+          :maxlength="500"
+        />
+        <view class="char-count">{{ purchaseGuideText.length }}/70</view>
+      </view>
+    </view>
+
     <view class="form-section">
       <view class="form-item" @click="showPicker">
-        <text class="form-label">购买须知</text>
+        <text class="form-label">公告详情</text>
         <view class="form-control">
-          <text class="select-text">{{ selectedValue || '请选择' }}</text>
+          <text class="select-text">{{ selectedValue || '请选图文' }}</text>
           <text class="arrow">></text>
         </view>
       </view>
     </view>
 
-    <!-- 按钮部分 -->
     <view class="button-section">
       <button class="btn btn-cancel" @click="onCancel">返回</button>
       <button class="btn btn-submit" @click="onSubmit">提交</button>
@@ -46,7 +61,8 @@ export default {
         selectedValue: '', // 选中的值
         saveSelectedValue: '', // 保存选中的值
         selectedId: 0, // 选中的id
-        formData: {}
+        formData: {},
+        purchaseGuideText: '' // 公告内容
     }
   },
   onShow() {
@@ -59,8 +75,8 @@ export default {
     init(){
         getShopPurchaseGuide().then(res => {
             this.purchaseGuideData = res.data.shopExt;
-            this.status = this.purchaseGuideData.purchaseGuide > 0 ? true : false;
-            
+            this.status = res.data.shop && res.data.shop.buyNotice == 1 ? true : false;
+            this.purchaseGuideText = res.data.shopExt && res.data.shopExt.purchaseGuideText ? res.data.shopExt.purchaseGuideText : ''
             // 根据 purchaseGuide 和 title 设置选中值
             if (this.purchaseGuideData.purchaseGuide !== "0" && this.purchaseGuideData.title) {
                 this.selectedValue = `${this.purchaseGuideData.title} (id: ${this.purchaseGuideData.purchaseGuide})`;
@@ -75,63 +91,37 @@ export default {
     // 状态开关变化
     onStatusChange(e) {
       this.status = e.detail.value
-      console.log('状态变化:', this.status ? '开启' : '关闭')
       if (this.status) {
         this.selectedValue = this.saveSelectedValue;
       } else {
         this.selectedValue = '...';
       }
     },
-
     // 显示选择器
     showPicker() {
-      if (this.status == false) {
-        this.$msg('状态开启后，才能选择购买须知')
-        return
-      }
-      uni.navigateTo({
-        url: `/admin/picText/picTextList?selectedId=${this.selectedId}`
-      });
+      uni.navigateTo({ url: `/admin/picText/picTextList?selectedId=${this.selectedId}` })
     },
-
     // 取消按钮
     onCancel() {
       uni.navigateBack();
     },
-
     // 提交按钮
     onSubmit() {
-      if (!this.selectedValue) {
-        this.$msg('请先选择选项')
-        return
-      }
-
-      const formData = {
-        picTextId: this.selectedId,
-        switch: this.status ? 1 : 0
-      }
-      //console.log('提交表单数据:', formData)
-      
-      // 这里可以调用API提交数据
-      uni.showLoading({
-        title: '提交中...'
-      })
-
+      const formData = { picTextId: this.selectedId, switch: this.status ? 1 : 0, purchaseGuideText:this.purchaseGuideText }
+      uni.showLoading()
       switchPurchaseGuide(formData).then(res => {
         uni.hideLoading();
         if(res.code == 1){
-          uni.showToast({
-            title: '提交成功',
-            icon: 'success'
-          })
+          uni.showToast({ title: '提交成功', icon: 'success' })
+          setTimeout(() => {
+            uni.navigateBack()
+          }, 1500);
         } else {
           this.$msg(res.msg)
         }
       })
     },
-
     updateSelectedItem(data) {
-      console.log('更新选中项:', data)
       // 更新选中项显示
       if (data && data.picTextId && data.title) {
         this.selectedValue = `${data.title} (ID: ${data.picTextId})`;
@@ -211,6 +201,36 @@ export default {
   margin-left: 4rpx;
 }
 
+.textarea-item {
+  min-height: auto;
+  padding: 30rpx 0 20rpx 0;
+}
+
+.textarea-wrapper {
+  position: relative;
+  padding: 0 0 30rpx 0;
+}
+
+.textarea-input {
+  width: 100%;
+  height: 200rpx;
+  padding: 20rpx;
+  border: 1rpx solid #e0e0e0;
+  border-radius: 8rpx;
+  font-size: 28rpx;
+  color: #333333;
+  box-sizing: border-box;
+  line-height: 1.5;
+}
+
+.char-count {
+  position: absolute;
+  bottom: 40rpx;
+  right: 20rpx;
+  font-size: 24rpx;
+  color: #999999;
+}
+
 .button-section {
   display: flex;
   gap: 30rpx;

ghsApp/src/api/item/index.js

@@ -125,4 +125,8 @@ export const getPriceChangeList = data => {
 
 export const getCostChangeList = data => {
 	return https.get('/cost-change/list', data)
+}
+
+export const changeVirtualStock = data => {
+	return https.get('/item/change-virtual-stock', data)
 }

ghsApp/src/pages.json

@@ -550,7 +550,7 @@
 				{"path": "picTextList","style": {"navigationBarTitleText": "图文"}},
 				{"path": "picTextAdd","style": {"navigationBarTitleText": "创建图文"}},
 				{"path": "preview","style": {"navigationBarTitleText": "图文预览"}},
-				{"path": "purchaseGuide","style": {"navigationBarTitleText": "购买须知"}}
+				{"path": "purchaseGuide","style": {"navigationBarTitleText": "商城公告"}}
 			]
 		}
 	],

ghsPad/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "销花宝收银",
     "appid" : "__UNI__E2D4F80",
     "description" : "鲜花批发销售管理系统",
-    "versionName" : "1.4.7",
-    "versionCode" : 147,
+    "versionName" : "1.4.8",
+    "versionCode" : 148,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

hdApp/src/admin/cg/code.vue

@@ -3,10 +3,19 @@
     <view class="img_box" style="margin-top:30upx;">
       <image :src="gatherUrl" mode="heightFix" class="img_url"></image>
     </view>
-    <view style="font-size:32upx;text-align: center;margin:30upx 0 5upx 0;">打印尺寸 100mmx150mm</view>
+    <view style="font-size:30upx;text-align: center;margin:30upx 0 5upx 0;">支持信用卡和花呗，打印尺寸100mmx150mm</view>
     <view class="confirm-btn">
       <button class="admin-button-com big blue" style="width:60vw;" @click="downloadImg(gatherUrl)">下载收款码</button>
     </view>
+
+    <view class="confirm-btn">
+      <button class="admin-button-com big blue" style="width:60vw;">购买音响 ¥160</button>
+    </view>
+
+    <view style="margin-top:30upx;text-align:center;margin-bottom:30upx;">
+      <image :src="laba" mode="widthFix" style="width:640upx;margin:0 auto;border-radius: 10upx;"></image>
+    </view>
+
   </view>
 </template>
 <script>
@@ -14,7 +23,8 @@ import { miniGatheringCode } from '@/api/shop'
 export default {
   data() {
     return {
-      gatherUrl:''
+      gatherUrl:'',
+      laba: `${this.$constant.hostUrl}/image/horn.jpg`
     }
   },
   methods: {

hdApp/src/admin/home/workbench.vue

@@ -274,18 +274,18 @@
               </view>
               <view class="icon-text">图文</view>
             </view>
-            <view class="icon-item" @click="goPage({url: '/admin/cg/code'})">
-              <view class="icon-wrapper">
-                <image class="icon-image" :src="`${constant.hostUrl}/image/ghs/home/shop2.png`" mode="aspectFit"></image>
-              </view>
-              <view class="icon-text">收款码</view>
-            </view>
             <view class="icon-item" @click="goPage({url: '/admin/order/scanPay'})">
               <view class="icon-wrapper">
                 <image class="icon-image" :src="`${constant.hostUrl}/image/ghs/home/kcyjs2.png`" mode="aspectFit"></image>
               </view>
               <view class="icon-text">收款码流水</view>
             </view>
+            <view class="icon-item" @click="goPage({url: '/admin/cg/code'})">
+              <view class="icon-wrapper">
+                <image class="icon-image" :src="`${constant.hostUrl}/image/ghs/home/shop2.png`" mode="aspectFit"></image>
+              </view>
+              <view class="icon-text">收款码</view>
+            </view>
           </view>
         </view>
 
@@ -377,7 +377,7 @@
             </view>
           </view>
 
-          <view v-if="!$util.isEmpty(data.warning)" style="color:red;font-size:36upx;font-weight:bold;text-align:center;margin-bottom:15upx;margin-top:20upx;">{{ data.warning }}</view>
+          <view v-if="!$util.isEmpty(data.warning)" class="warning-banner">{{ data.warning }}</view>
 
         <template v-if="!$util.isEmpty(ad)">
           <block v-for="(adInfo, adIndex) in ad" :key="adIndex">
@@ -1978,7 +1978,7 @@ export default {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    padding: 30upx 24upx;
+    padding: 30upx 18upx;
     min-height: 100upx;
     
     .alert-title {
@@ -2029,13 +2029,25 @@ export default {
 }
 
 .alert-card-error {
-  background: linear-gradient(135deg, #fff2f0 0%, #fff7f5 100%);
-  border-color: #fff7f5;
-  
+  background-color: #ff6b6b;
+  border-color: #ff6b6b;
   .alert-content {
     .alert-text {
-      color: #d9363e;
+      font-size:32upx;
+      color: white;
     }
   }
 }
+
+.warning-banner {
+  background-color: #ff6b6b;
+  border-radius: 8upx;
+  margin: 0upx 10upx 20upx 10upx;
+  padding: 20upx 24upx;
+  color: #ffffff;
+  font-size: 32upx;
+  font-weight: 600;
+  text-align: center;
+  line-height: 1.4;
+}
 </style>

hdApp/src/admin/item/detail.vue

@@ -434,7 +434,7 @@
 import TuiListCell from "@/components/plugin/list-cell";
 const form = require("@/utils/formValidation.js");
 import { getAllItemClass } from "@/api/item-class";
-import { applyAuth,modifyCgStaff,setLosing,modifyUnit,modifyRatio,modifyWeight,clearLimitBuy } from '@/api/item';
+import { applyAuth,modifyCgStaff,setLosing,modifyUnit,modifyRatio,modifyWeight,clearLimitBuy,changeVirtualStock } from '@/api/item';
 import { getAllUnit } from "@/api/unit";
 import { addProduct,updateProduct,getProductDetail,py,print,modifyOnStockFn,delStatusUpdate,changeBelongCost,modifyPartAcceptItem } from "@/api/product";
 import { getPtItemDetail } from "@/api/pt-item";
@@ -1048,6 +1048,13 @@ export default {
     },
     virtualStockChange(value){
       this.form.virtualStock = value
+      if(this.productData.id && Number(this.productData.id)>0){
+        changeVirtualStock({id:this.productData.id,virtualStock:this.form.virtualStock}).then(res=>{
+          if(res.code == 1){
+            this.$msg('修改成功')
+          }
+        })
+      }
     },
     frontUseChange(e){
       this.form.frontUse = e.detail.value ? 1 : 0;

hdApp/src/api/item/index.js

@@ -22,4 +22,8 @@ export const getPoster = data => {
 
 export const changeFrontHide = data => {
 	return https.get('/item/change-front-hide', data)
+}
+
+export const changeVirtualStock = data => {
+	return https.get('/item/change-virtual-stock', data)
 }

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -13,9 +13,12 @@
 					</view>
 				</view>
 			</view>
-			<view>
-			<image v-if="buyNotice == 1" :src="`${constant.hostUrl}/image/cg/buy_look2.png?v=1`" @click.stop="getReadMe(ghsInfo.shopId)" style="border-radius:10upx;margin-top:9upx;" mode="widthFix"></image>
-			</view>
+			<block v-if="buyNotice == 1">
+				<image v-if="ghsInfo.buyNoticeText == '' || ghsInfo.buyNoticeText == null" :src="`${constant.hostUrl}/image/cg/buy_look2.png?v=1`" @click.stop="getReadMe(ghsInfo.shopId)" style="border-radius:10upx;margin-top:9upx;" mode="widthFix"></image>
+				<view class="notice-banner" @click.stop="getReadMe(ghsInfo.shopId)" v-else>
+					<text class="notice-text">{{ ghsInfo.buyNoticeText }}</text>
+				</view>
+			</block>
 		</view>
 
 		<view class="input-wrap" >
@@ -839,6 +842,30 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.notice-banner {
+	margin-top: 9upx;
+	padding: 0upx 20upx;
+	background: linear-gradient(135deg, #3385FF 0%, #5BA3FF 100%);
+	border-radius: 10upx;
+	box-shadow: 0upx 4upx 12upx rgba(51, 133, 255, 0.2);
+	transition: transform 0.2s ease, box-shadow 0.2s ease;
+	height:150upx;
+	display: flex;
+	align-items: center;
+	overflow-y: auto;
+	overflow-x: hidden;
+	.notice-text {
+		display: block;
+		font-size: 30upx;
+		color: #ffffff;
+		line-height: 1.6;
+		text-align: left;
+		font-weight: 540;
+		max-height: 150upx;
+		overflow: hidden;
+	}
+}
+
 .class-popup-style{
 	z-index:999999;
 }
@@ -932,7 +959,7 @@ export default {
   }
 	.input-wrap {
 		display: flex;
-		padding: 22upx 20upx 22upx 13upx;
+		padding: 18upx 20upx 22upx 13upx;
 		.search-bar {
 			flex: 1;
 		}
@@ -1070,7 +1097,7 @@ export default {
     animation-duration:.3s;
   }
   .fadeIn{
-	height: 290upx;
+	height: 300upx;
     overflow: hidden;
     animation-name: fadeInFrames;
     animation-duration:.3s;

hdApp/src/pagesPurchase/readMe.vue

@@ -14,7 +14,6 @@
 				/>
 			</view>
 		</view>
-			
 
 		<view class="list" v-if="shopId == 65591">
 			<view>
@@ -434,33 +433,6 @@
 				<image mode="widthFix" :src="`${constant.imgUrl}/ghs/fqhhxhpf.jpg`" style="width:100%;"></image>
 			</view>
 		</view>
-		<view class="list" v-if="shopId == 36523">
-			<view>
-				<image mode="widthFix" :src="`${constant.imgUrl}/ghs/a_hr_before.jpg?v=3`" style="width:100%;"></image>
-			</view>
-            <view>
-				<image class="image" :src="`${constant.imgUrl}/ghs/b_hr_after1.jpg?v=3`" mode="widthFix"></image>
-				<image class="image" :src="`${constant.imgUrl}/ghs/b_hr_after2.jpg?v=3`" mode="widthFix"></image>
-			</view>
-		</view>
-		<view class="list" v-if="shopId == 8345">
-			<view>
-				<image mode="widthFix" :src="`${constant.imgUrl}/ghs/a_hr_before.jpg?v=3`" style="width:100%;"></image>
-			</view>
-            <view>
-				<image class="image" :src="`${constant.imgUrl}/ghs/b_hr_after1.jpg?v=3`" mode="widthFix"></image>
-				<image class="image" :src="`${constant.imgUrl}/ghs/b_hr_after2.jpg?v=3`" mode="widthFix"></image>
-			</view>
-		</view>
-		<view class="list" v-if="shopId == 8249">
-			<view>
-				<image mode="widthFix" :src="`${constant.imgUrl}/ghs/a_hr_before.jpg?v=3`" style="width:100%;"></image>
-			</view>
-            <view>
-				<image class="image" :src="`${constant.imgUrl}/ghs/b_hr_after1.jpg?v=3`" mode="widthFix"></image>
-				<image class="image" :src="`${constant.imgUrl}/ghs/b_hr_after2.jpg?v=3`" mode="widthFix"></image>
-			</view>
-		</view>
 		<view class="list" v-if="shopId == 1421">
 			<view>
 				<image mode="widthFix" :src="`${constant.imgUrl}/ghs/ttxhjm.jpg`" style="width:100%;"></image>

hdPad/src/manifest.json

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

开发http/ghsPad/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "销花宝收银",
     "appid" : "__UNI__E2D4F80",
     "description" : "鲜花批发销售管理系统",
-    "versionName" : "1.4.7",
-    "versionCode" : 147,
+    "versionName" : "1.4.8",
+    "versionCode" : 148,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

开发http/hdPad/src/manifest.json

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

开发https/ghsPad/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "销花宝收银",
     "appid" : "__UNI__E2D4F80",
     "description" : "鲜花批发销售管理系统",
-    "versionName" : "1.4.7",
-    "versionCode" : 147,
+    "versionName" : "1.4.8",
+    "versionCode" : 148,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

开发https/hdPad/src/manifest.json

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

线上/ghsPad/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "销花宝收银",
     "appid" : "__UNI__E2D4F80",
     "description" : "鲜花批发销售管理系统",
-    "versionName" : "1.4.7",
-    "versionCode" : 147,
+    "versionName" : "1.4.8",
+    "versionCode" : 148,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

线上/hdPad/src/manifest.json

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