Merge branch 'master' into zhongqi-delivery

ghsApp/src/admin/item/detail.vue

@@ -288,6 +288,11 @@
             </radio-group>
           </tui-list-cell>
 
+          <tui-list-cell class="line-cell" :arrow="true" @click="selectMyItem()" v-if="productData.id && Number(productData.id)>0">
+            <div class="tui-title">拆散分到</div>
+            <view>{{ productData.partAcceptItemName?productData.partAcceptItemName:'' }}</view>
+          </tui-list-cell>
+
       </view>
 
       <view class="app-footer">
@@ -455,7 +460,7 @@ import { getAllItemClass } from "@/api/item-class";
 import { applyAuth,modifyCgStaff,setLosing,modifyUnit,modifyRatio,modifyWeight,clearLimitBuy } from '@/api/item';
 //import { delCpItem,addCpItem } from '@/api/cp'
 import { getAllUnit } from "@/api/unit";
-import { addProduct,updateProduct,getProductDetail,py,print,modifyOnStockFn,delStatusUpdate,changeBelongCost,modifyAvCost } from "@/api/product";
+import { addProduct,updateProduct,getProductDetail,py,print,modifyOnStockFn,delStatusUpdate,changeBelongCost,modifyAvCost,modifyPartAcceptItem } from "@/api/product";
 import { getPtItemDetail } from "@/api/pt-item";
 import { wastage } from "@/api/order";
 import { mapGetters } from "vuex"
@@ -550,7 +555,10 @@ export default {
         {name: '康乃馨', weight: '1公斤'},
         {name: '向日葵', weight: '2.7公斤或3公斤'},
         {name: '其他', weight: '0.5公斤或1公斤'}
-      ]
+      ],
+      partAcceptItem:0,
+      partAcceptItemName:'',
+      partAcceptItemModify:0
     };
   },
 	computed:{
@@ -603,8 +611,24 @@ export default {
         that.$forceUpdate()
       }
     }
+
+    //修改拆散的子花材 ssh 20251124
+    if(this.partAcceptItemModify == 1){
+      this.partAcceptItemModify = 0
+      modifyPartAcceptItem({big:this.productData.id,small:this.partAcceptItem}).then(res=>{
+        if(res.code == 1){
+          this.$msg('修改成功')
+          this.productData.partAcceptItemName = this.partAcceptItemName
+          this.$forceUpdate()
+        }
+      })
+    }
+
   },
   methods: {
+    selectMyItem(){
+      this.$util.pageTo({ url: '/admin/item/selectItem?style=3'})
+    },
     selCoverFn(index) {
       this.form.cover = this.form.images[index];
     },

ghsApp/src/admin/item/selectItem.vue

@@ -116,6 +116,14 @@
           }
           prevPage.$vm.selectItemOk=1
           uni.navigateBack({})
+        }else if(style == 3){
+          //修改拆散库存到的花材
+          let pages = getCurrentPages();
+          let prevPage = pages[ pages.length - 2 ];
+          prevPage.$vm.partAcceptItemModify = 1
+          prevPage.$vm.partAcceptItem = item.id
+          prevPage.$vm.partAcceptItemName = item.name
+          uni.navigateBack({})
         }else{
           //无操作
         }

ghsApp/src/api/product/index.js

@@ -143,4 +143,8 @@ export const changeBelongCost = data => {
 //修改平均成本
 export const modifyAvCost = data => {
 	return https.get("/product/modify-av-cost", data);
+};
+
+export const modifyPartAcceptItem = data => {
+	return https.get("/product/modify-part-accept-item", data);
 };

hdApp/.hbuilderx/launch.json

@@ -23,6 +23,7 @@
             "type" : "uniCloud"
         },
         {
+            "customPlaygroundType" : "local",
             "playground" : "custom",
             "type" : "uni-app:app-android"
         },

hdApp/src/admin/billing/affirmGhs.vue

@@ -1000,6 +1000,9 @@ export default {
 	height: 100%;
 	display: flex;
 	flex-direction: column;
+	/* #ifdef APP-PLUS */
+	padding-bottom: 100upx;
+	/* #endif */
 	.affirm-view {
 		flex: 1;
 		padding: 20upx;
@@ -1180,8 +1183,21 @@ export default {
 		width: 100%;
 		height: 100upx;
 		background-color: #fff;
-
 		box-shadow: 0upx -1px 6upx 0upx rgba(4, 0, 0, 0.06);
+		/* #ifdef APP-PLUS */
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		z-index: 999;
+		/* #endif */
+		/* #ifdef MP-WEIXIN */
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		z-index: 999;
+		/* #endif */
 		.price-view {
 			display: flex;
 			align-items: center;

hdApp/src/admin/billing/affirmGhsBook.vue

@@ -629,6 +629,9 @@ export default {
 	height: 100%;
 	display: flex;
 	flex-direction: column;
+	/* #ifdef APP-PLUS */
+	padding-bottom: 100upx;
+	/* #endif */
 	.affirm-view {
 		flex: 1;
 		padding: 20upx;
@@ -755,8 +758,21 @@ export default {
 		width: 100%;
 		height: 100upx;
 		background-color: #fff;
-
 		box-shadow: 0upx -1px 6upx 0upx rgba(4, 0, 0, 0.06);
+		/* #ifdef APP-PLUS */
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		z-index: 999;
+		/* #endif */
+		/* #ifdef MP-WEIXIN */
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		z-index: 999;
+		/* #endif */
 		.price-view {
 			display: flex;
 			align-items: center;

hdApp/src/admin/item/detail.vue

@@ -274,6 +274,10 @@
             </radio-group>
           </tui-list-cell>
 
+          <tui-list-cell class="line-cell" :arrow="true" @click="selectMyItem()" v-if="productData.id && Number(productData.id)>0">
+            <div class="tui-title">拆散分到</div>
+            <view>{{ productData.partAcceptItemName?productData.partAcceptItemName:'' }}</view>
+          </tui-list-cell>
 
       </view>
 
@@ -429,7 +433,7 @@ const form = require("@/utils/formValidation.js");
 import { getAllItemClass } from "@/api/item-class";
 import { applyAuth,modifyCgStaff,setLosing,modifyUnit,modifyRatio,modifyWeight,clearLimitBuy } from '@/api/item';
 import { getAllUnit } from "@/api/unit";
-import { addProduct,updateProduct,getProductDetail,py,print,modifyOnStockFn,delStatusUpdate,changeBelongCost } from "@/api/product";
+import { addProduct,updateProduct,getProductDetail,py,print,modifyOnStockFn,delStatusUpdate,changeBelongCost,modifyPartAcceptItem } from "@/api/product";
 import { getPtItemDetail } from "@/api/pt-item";
 import { wastage } from "@/api/order";
 import { mapGetters } from "vuex"
@@ -521,7 +525,10 @@ export default {
         {name: '向日葵', weight: '2.7公斤或3公斤'},
         {name: '其他', weight: '0.5公斤或1公斤'}
       ],
-      printFocus:false
+      printFocus:false,
+      partAcceptItem:0,
+      partAcceptItemName:'',
+      partAcceptItemModify:0
     };
   },
 	computed:{
@@ -574,8 +581,24 @@ export default {
         that.$forceUpdate()
       }
     }
+
+    //修改拆散的子花材 ssh 20251124
+    if(this.partAcceptItemModify == 1){
+      this.partAcceptItemModify = 0
+      modifyPartAcceptItem({big:this.productData.id,small:this.partAcceptItem}).then(res=>{
+        if(res.code == 1){
+          this.$msg('修改成功')
+          this.productData.partAcceptItemName = this.partAcceptItemName
+          this.$forceUpdate()
+        }
+      })
+    }
+
   },
   methods: {
+    selectMyItem(){
+      this.$util.pageTo({ url: '/admin/item/selectItem?style=3'})
+    },
     printToFocus(){
 
     },

hdApp/src/admin/item/selectItem.vue

@@ -116,6 +116,14 @@
           }
           prevPage.$vm.selectItemOk=1
           uni.navigateBack({})
+        }else if(style == 3){
+          //修改拆散库存到的花材
+          let pages = getCurrentPages();
+          let prevPage = pages[ pages.length - 2 ];
+          prevPage.$vm.partAcceptItemModify = 1
+          prevPage.$vm.partAcceptItem = item.id
+          prevPage.$vm.partAcceptItemName = item.name
+          uni.navigateBack({})
         }else{
           //无操作
         }

hdApp/src/api/product/index.js

@@ -131,4 +131,8 @@ export const batchChangePrice = data => {
 //生成价格表 shish 20210922
 export const generatePriceTable = data => {
 	return https.get("/product/generate-price-table", data);
+};
+
+export const modifyPartAcceptItem = data => {
+	return https.get("/product/modify-part-accept-item", data);
 };

hdApp/src/manifest.json

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

hdApp/src/pagesPurchase/components/item.vue

@@ -84,10 +84,10 @@ export default {
 			type: Number,
 			default: 0
 		},
-		shopId:{
-			type: Number,
-			default: 0
-		},
+	shopId:{
+		type: [Number, String],
+		default: 0
+	},
 		showStock:{
 			type: String,
 			default: '0'

hdApp/src/pagesPurchase/contact.vue

@@ -11,16 +11,18 @@
     <view style="font-size:30upx;">答：直接搜索【花掌柜】注册，上面是不会显示商家的，你只能找批发店拿二维码，通过扫二维码进去注册之后，才会有商家</view>
 
     <view style="margin-top:20upx;color:#3385ff;font-size:30upx;font-weight:bold;">我注册之后，能不能注销？</view>
-    <view style="font-size:30upx;">答：注册之后暂时不能注销，不需要理会它就行。我们没有时间处理这块需求，请勿联系，否则可能挨骂，如确实有问题先找你的批发店反应，批发店再反应到我们这边。</view>
+    <view style="font-size:30upx;">答：注册之后暂时不能注销，不需要理会它就行。我们没有时间处理这块需求，请勿联系，否则基本挨骂，如确实有问题先找你的批发店反应，批发店再反应到我们这边。</view>
 
     <view style="margin-top:20upx;color:#3385ff;font-size:30upx;font-weight:bold;">我注册之后，显示的价格异常，怎么办？</view>
     <view style="font-size:30upx;">答：价格异常，请联系你的批发店，跟批发店设置有关。跟你注册时怎么填写是没有关系的，不需要注销，重新注册。如不联系批发店，注销重新注册，结果也一样的。</view>
 
-    <view style="font-size:40upx;margin-top:50upx;font-weight:bold;">
-    零售花店，现在没有可用的零售系统。请勿联系！请勿加微信！请勿加微信！请勿加微信！我们已经强调三遍了，加我们基本挨骂。后面有了我们会在系统里面公告。现在我们服务批发店就已经太多，公司客服人员不足，服务不过来，暂时没办法给你提供服务，请谅解。
+    <view style="font-size:40upx;margin-top:40upx;font-weight:bold;">
+    零售花店，现在没有可用的零售系统。请勿联系！请勿加微信！请勿加微信！请勿加微信！我们已经强调三遍了，加我们就挨骂。
     </view>
-
-    <view style="font-size:40upx;margin-top:50upx;font-weight:bold;color: red;margin-bottom:80upx;">
+    <view style="font-size:40upx;margin-top:40upx;font-weight:bold;">
+    后面有了我们会在系统里面公告。现在我们服务批发店就已经太多，公司客服人员不足，服务不过来，暂时没办法给你提供服务，请谅解。
+    </view>
+    <view style="font-size:40upx;margin-top:40upx;font-weight:bold;color: red;margin-bottom:80upx;">
     批发店，如碰到软件问题、系统问题和申请新商城需求，请联系软件公司，微信：15280215347<text @click="suggest" style="color:#3385ff;margin-left:10upx;">点击复制</text>
     </view>
 

hdApp/src/pagesPurchase/wechatPay.vue

@@ -45,9 +45,10 @@
         <!-- #ifdef APP-PLUS -->
         <div class="call-one-btn">
           <view>
-            <button class="button-com pay-wx" :class="[remainPayTime >0 ? 'green':'default']" :disabled="remainPayTime >0 ? false : true" @click="appWxPayFn">微信支付</button>
+            <!-- <button class="button-com pay-wx" :class="[remainPayTime >0 ? 'green':'default']" :disabled="remainPayTime >0 ? false : true" @click="appWxPayFn">微信支付</button> -->
+            <button class="button-com pay-wx" :class="[remainPayTime >0 ? 'green':'default']" :disabled="remainPayTime >0 ? false : true" @click="appAliPayFn(0)">微信支付</button>
           </view>
-          <button class="button-com pay-wx" :class="[remainPayTime >0 ? 'ali-btn':'default']" :disabled="remainPayTime >0 ? false : true" @click="appAliPayFn">支付宝支付</button>
+          <button class="button-com pay-wx" :class="[remainPayTime >0 ? 'ali-btn':'default']" :disabled="remainPayTime >0 ? false : true" @click="appAliPayFn(1)">支付宝支付</button>
           <button class="button-com pay-wx" :class="[remainPayTime >0 ? 'green':'default']" :disabled="remainPayTime >0 ? false : true" @click="debtPay" v-if="hasDebtPay === '1'">赊账</button>
         </div>
         <!-- #endif -->
@@ -184,14 +185,14 @@ export default {
         })
       })      
     },
-    appAliPayFn(){
+    appAliPayFn(payWay){
       let that = this
       // #ifdef MP-WEIXIN
       // #endif
       // #ifdef APP-PLUS
       uni.showLoading()
       let id = this.option.id ? this.option.id : 0   
-      purchaseAliPay({ orderSn: this.orderSn }).then(res => {
+      purchaseAliPay({ orderSn: this.orderSn,payWay:payWay }).then(res => {
         uni.hideLoading()
         if(res.code == 1){
           if(res.data.payUrl){

开发http/hdApp/src/manifest.json

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

开发https/hdApp/src/manifest.json

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

线上/hdApp/src/manifest.json

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