添加和修改项

ghsApp/src/admin/item/select.vue

@@ -8,8 +8,9 @@
 			</view>
 			<scroll-view scroll-y scroll-with-animation class="main-view">
 				<view class="space-view ex-table">
-					<view style="line-height:55upx;">
+					<view style="line-height:55upx;" v-if="!$util.isEmpty(selectList)">
 						<text v-for="(item, index) in selectList" :key="index" style="margin-right:36upx;font-size:30upx;" @click="delProduct(item)">{{ item.name }} {{ item.bigCount }} x</text>
+						<button @click="confirmChange()" class="admin-button-com blue mini-btn">确认提交</button>
 					</view>
 					<t-table :headerBackgroundColor="'#F0F2F6'">
 						<block v-if="!$util.isEmpty(list.data)">
@@ -27,7 +28,7 @@
 										<input type="text" v-model="productItem.bigCount" class="inp-input" style="border:1upx solid #CCCCCC;font-size:29upx;color:black;" />
 									</t-td>
 									<t-td>
-										<button @click="addItem(productItem)" class="admin-button-com default middle">添加</button>
+										<button @click="tjItem(productItem)" class="admin-button-com blue middle">添加</button>
 									</t-td>
 								</t-tr>
 							</block>
@@ -51,6 +52,7 @@ import {mapActions, mapGetters} from "vuex";
 import AppSearchModule from "@/components/module/app-search";
 import ModalModule from "@/components/plugin/modal"
 import { getWeixinId } from "@/api/invite";
+import { addItem } from "@/api/order-item";
 import productMins from "@/mixins/product";
 export default {
 	components: { SelectList, AppWrapperEmpty,ShopSelect,DateSelect,AppSearchModule,ModalModule},
@@ -100,13 +102,28 @@ export default {
 		}
 	},
 	methods: {
+		confirmChange(){
+			let that = this
+			if(this.$util.isEmpty(this.selectList)){
+				this.$msg('请选择花材')
+				return false
+			}
+			let id = this.option.id ? this.option.id : 0
+			that.$util.confirmModal({content:'确认提交？'},() => {
+				addItem({data:JSON.stringify(that.selectList),id:id}).then(res=>{
+					if(res.code == 1){
+						uni.navigateBack()
+					}
+				})
+			})
+		},
 		delProduct(item){
 			let that = this
 			that.$util.confirmModal({content:'确认删除？'},() => {
-				that.delItem(item)
+				that.delSelectedItem(item)
 			})
 		},
-		addItem(item){
+		tjItem(item){
 			this.customData = item
 			this.customData.userPrice = 0.1
 			this.confirmAddItemModel(this.customData)

ghsApp/src/api/order-item/index.js

@@ -1,5 +1,13 @@
 import https from "@/plugins/luch-request_0.0.7/request";
 
+export const addItem = data => {
+	return https.post("/order-item/add-item", data);
+};
+
+export const delItem = data => {
+	return https.post("/order-item/del-item", data);
+};
+
 //赠送花材
 export const giveItem = data => {
 	return https.post("/order-item/give-item", data);

ghsApp/src/mixins/product.js

@@ -462,7 +462,7 @@ export default {
 
 
 		},
-		delItem(product){
+		delSelectedItem(product){
 			let item = copyObject(product)
 			const list = this.selectList
 			let index = list.findIndex(element => element.id == item.id)

ghsApp/src/pagesOrder/detail.vue

@@ -187,13 +187,13 @@
 			</view>
 			<view class="module-com content-box">
 				<view class="commodity-view">
-					<view style="text-align:right;margin-right:20upx;padding-top:10upx;">
-						<button class="admin-button-com blue mini-btn" @click="addItem(detailInfo)">加花材</button>
+					<view style="text-align:right;margin-right:20upx;padding-top:10upx;" v-if="detailInfo.book == 1 && detailInfo.status == 2 && parseFloat(detailInfo.actPrice) == 0">
+						<button class="admin-button-com default mini-btn" @click="addItem(detailInfo)">加花材</button>
 					</view>
 					<view class="commodity-list">
 						<view v-for="(s, idx) in detailInfo.product" :key="idx" class="commodity-item" style="position:relative;">
 							<image class="item-icon" :src="s.cover" @click.stop="previewImage(s.bigCover)" />
-							<button style="position:absolute;left:16upx;" class="admin-button-com blue mini-btn" @click="delItem(s)">删除</button>
+							<button v-if="detailInfo.book == 1 && detailInfo.status == 2 && parseFloat(detailInfo.actPrice) == 0" style="position:absolute;left:16upx;" class="admin-button-com default mini-btn" @click="delOption(s)">删除</button>
 
 							<text style="position:absolute;left:155upx;top:103upx;color:#3385FF;" @click="giveItemFn(s)">发起赠送</text>
 
@@ -409,6 +409,7 @@ import { hasHitNavigate } from "@/api/map";
 import { getWeixinId } from "@/api/invite";
 import { IMGHOST } from '@/config'
 import { partItem } from "@/api/part"
+import { delItem } from "@/api/order-item";
 import ModalModule from "@/components/plugin/modal"
 export default {
 	name: "orderDetail",
@@ -635,10 +636,14 @@ export default {
 				})
 			})
 		},
-		delItem(item){
+		delOption(item){
 			let that = this
 			that.$util.confirmModal({content:'确认删除？'},() => {
-				
+				delItem({id:that.detailInfo.id,smallId:item.id}).then(res=>{
+					if(res.code == 1){
+						that.$msg(res.msg)
+					}
+				})
 			})
 		},
 		addItem(info){