产品和花材

ghsApp/src/admin/cp/item.vue

@@ -3,9 +3,12 @@
           <view class="billing_box_bg">
 
             <view class="input-wrap">
-                  <view class="search-bar">
-                      <app-search-module v-model="py" placeholder="这里搜索花材" @input="searchFn"/>
-                  </view>
+                <view class="search-bar">
+                    <app-search-module v-model="py" placeholder="这里搜索花材" @input="searchFn"/>
+                </view>
+                <view style="padding:0 0upx 0 15upx;" >
+                    <button class="admin-button-com middle blue" @click="pageTo({ url: '/admin/ptItem/itemList' })">添花材</button>
+                </view>
               </view>
 
               <view class="scroll-middle_bx">

ghsApp/src/admin/cp/list.vue

@@ -9,8 +9,11 @@
                       <app-search-module v-model="py" placeholder="这里搜索产品" @input="searchFn"/>
                   </view>
                   <view style="padding:0 0upx 0 15upx;" >
-                      <button class="admin-button-com middle blue" @click="pageTo({ url: '/admin/cp/ptCpList' })">添加产品</button>
+                      <button class="admin-button-com middle blue" @click="pageTo({ url: '/admin/cp/ptCpList' })">添产品</button>
                   </view>
+                  <view style="padding:0 0upx 0 15upx;" >
+                    <button class="admin-button-com middle blue" @click="pageTo({ url: '/admin/ptItem/itemList' })">添花材</button>
+                </view>
               </view>
               <view class="scroll-middle_bx">
                 <scroll-view scroll-y scroll-with-animation class="tab-view" :scroll-top="scrollTop">

ghsApp/src/admin/item/detail.vue

@@ -17,7 +17,11 @@
         <tui-list-cell class="line-cell" :hover="false" v-if="productData.id && productData.id>0">
           <view class="tui-title">编号</view>
           <view style="color:#CCCCCC;width:300upx;" @click="getItemId(productData)">{{productData.itemId?productData.itemId:0}}</view>
-          <button v-if="productData.id > 0" class="admin-button-com default mini-btn" @click="delProduct(productData)">删除花材</button>
+          <block v-if="productData.id && productData.id > 0">
+          <button v-if="productData.delStatus == 0" class="admin-button-com default mini-btn" @click="changeDelStatus(productData,1)">删除花材</button>
+
+          <button v-else class="admin-button-com blue mini-btn" @click="changeDelStatus(productData,0)">恢复花材</button>
+          </block>
         </tui-list-cell>
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">名称</view>
@@ -440,14 +444,15 @@ export default {
         }
       })
     },
-    delProduct(info){
+    changeDelStatus(info,flag){
 			let that = this
-			that.$util.confirmModal({content:'确认删除?'},() => {
-				delStatusUpdate({id:info.id,delStatus:1}).then(res=>{
+      let remind = flag == 1 ? '确认删除？' : '确认恢复？'
+			that.$util.confirmModal({content:remind},() => {
+				delStatusUpdate({id:info.id,delStatus:flag}).then(res=>{
 					if(res.code == 1){
             that.hasRequest = 0
             that.init()
-						that.$msg('删除成功')
+						that.$msg(res.msg)
 					}
 				})
 			})

ghsApp/src/components/module/app-search.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="app-search-module" :style="{ height: height + 'upx' }">
-		<div class="map-search" :style="{ backgroundColor: backColor }" style="height: 80upx">
+		<div class="map-search" :style="{ backgroundColor: backColor }" style="height:72upx">
 			<div class="icon-wrap" v-if="isIcon">
 				<i class="iconfont" :class="[icon]"></i>
 			</div>