shish před 3 roky
rodič
revize
951ce4ee95

+ 1 - 1
hdApp/src/admin/coupon/components/selectCouponItem.vue

@@ -14,7 +14,7 @@
       <div class="list-det-right">
         <div class="coupon-message">
           <div class="app-color-2" style="color:#b8b6b6;font-weight:600;">{{item.name}}</div>
-          <div>适用:全品</div>
+          <div>适用:全品</div>
           <div>有效期:{{ item.endTime}}</div>
         </div>
       </div>

+ 1 - 1
hdApp/src/admin/coupon/selectCouponList.vue

@@ -14,7 +14,7 @@
           <div class="list-det-right">
             <div class="coupon-message">
               <div class="app-color-2" style="color:#333333;font-weight:600;">{{ item.name}}</div>
-              <div>适用:全品</div>
+              <div>适用:全品</div>
               <div>有效期:{{ item.endTime}}</div>
             </div>
           </div>

+ 3 - 3
hdApp/src/admin/goods/add.vue

@@ -14,7 +14,7 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="true" :arrow="true">
-          <view class="tui-title required">品</view>
+          <view class="tui-title required">品</view>
           <view v-if="!$util.isEmpty(form.kindName)" style="width:480upx" @click.stop="changeKind()">{{form.kindName}}</view>
           <view v-else style="color:#CCCCCC;width:480upx" @click.stop="changeKind()">请选择</view>
         </tui-list-cell>
@@ -201,11 +201,11 @@ export default {
       }
 
       if(!this.form.kindId || Number(this.form.kindId) == 0){
-        this.$msg('请选择品')
+        this.$msg('请选择品')
         return false
       }
       if (this.$util.isEmpty(this.form.kindName)) {
-        this.$msg("请选择品哦")
+        this.$msg("请选择品哦")
         return false
       }
 

+ 1 - 1
hdApp/src/admin/goods/category.vue

@@ -105,7 +105,7 @@ export default {
                 },
                 {
                     value: 0,
-                    name: '绿植花瓶',
+                    name: '绿植盆栽',
 					flag:'mater'
                 }
             ],

+ 2 - 2
hdApp/src/admin/goods/cgNewPlant.vue

@@ -4,7 +4,7 @@
       <view class="module-com input-line-wrap">
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">品</view>
+          <view class="tui-title">品</view>
           <view style="color:#3385FF">{{option.kindName ? option.kindName : ''}}</view>
         </tui-list-cell>
 
@@ -151,7 +151,7 @@ export default {
       }
       let kindId = this.option.kindId ? this.option.kindId : 0
       if(Number(kindId) <= 0){
-        this.$msg('请选择品')
+        this.$msg('请选择品')
         return false
       }
       let kindName = this.option.kindName ? this.option.kindName : ''

+ 3 - 3
hdApp/src/admin/goods/detail.vue

@@ -11,7 +11,7 @@
           <input v-model="form.price" @focus="form.price=''" placeholder-class="phcolor" class="tui-input" name="price" placeholder="请输入" maxlength="50" type="digit" />
         </tui-list-cell>
         <tui-list-cell class="line-cell" :hover="true" :arrow="true">
-          <view class="tui-title required">品</view>
+          <view class="tui-title required">品</view>
           <view v-if="!$util.isEmpty(form.kindName)" style="width:480upx;" @click.stop="changeKind()">{{form.kindName}}</view>
           <view v-else style="color:#CCCCCC;width:480upx;" @click.stop="changeKind()">请选择</view>
         </tui-list-cell>
@@ -275,11 +275,11 @@ export default {
       this.form.categoryIdList = newIds
 
       if(!this.form.kindId || Number(this.form.kindId) == 0){
-        this.$msg('请选择品')
+        this.$msg('请选择品')
         return false
       }
       if (this.$util.isEmpty(this.form.kindName)) {
-        this.$msg("请选择品哦")
+        this.$msg("请选择品哦")
         return false
       }
 

+ 4 - 41
hdApp/src/admin/goods/kind.vue

@@ -23,7 +23,7 @@
 		</view>
 
 		<view class="app-footer">
-			<button class="admin-button-com big blue" @click="addKindFn">添加品</button>
+			<button class="admin-button-com big blue" @click="addKindFn">添加品</button>
 		</view>
 
 		<modal-module :show="modifyModal" :maskClosable="false" @cancel="modalCancel" @click="modifyModalClick" width="92%" :title="modifyTitle" padding="30rpx 30rpx">
@@ -41,16 +41,6 @@
 							<input type="number" v-model="modifyForm.inTurn" @focus="modifyForm.inTurn=''" :adjust-position="false" class="inp-input" placeholder="值越大越靠前" />
 						</view>
 					</view>
-					<view class="inp-list-line">
-						<view class="line-label">属性</view>
-						<view class="line-input">
-							<radio-group @change="radioChange">
-								<label style="display:inline-block;font-size:30upx;" :for="item.flag" v-for="(item, index) in catItem" :key="index">
-									<radio :id="item.flag" :value="item.value" :checked="Number(item.value) == Number(flower)" :disabled="catDisabled" style="transform: scale(0.7,0.7);" />{{item.name}}
-								</label>
-							</radio-group>
-						</view>
-					</view>
 				</view>
 			</template>
 		</modal-module>
@@ -87,24 +77,6 @@ export default {
 			operateData: {},
 			operateIndex: null,
 			operateTop: 0,
-			catItem: [
-				{
-                    value: 2,
-                    name: '请选择',
-					flag:'notSel'
-                },
-				{
-                    value: 1,
-                    name: '鲜花类',
-					flag:'flower'
-                },
-                {
-                    value: 0,
-                    name: '绿植花瓶',
-					flag:'mater'
-                }
-            ],
-            flower:2,
 			catDisabled:false
 		}
 	},
@@ -124,14 +96,10 @@ export default {
 		}
 	},
 	methods: {
-		radioChange(e){
-			this.flower = e.detail.value
-		},
 		edit(item){
 			this.modifyModal = true
 			this.modifyTitle = '编辑'
 			this.modifyForm = { kindId:item.id, name: item.name, inTurn: item.inTurn }
-			this.flower = parseInt(item.flower)
 			this.catDisabled = true
 		},
 		addKindFn() {
@@ -142,19 +110,18 @@ export default {
 		},
 		resetForm() {
 			this.modifyForm = {kindId:0, name: '', inTurn: '', status: 1 }
-			this.flower = 2
 		},
 		async init() {
 			this.getKindData()
 		},
 		getKindData() {
-			return getKindList({page:this.list.page}).then(res => {
+			return getKindList({page:this.list.page,flower:1}).then(res => {
 				this.completes(res)
 			})
 		},
 		kindAddOrEdit() {
 			if (!this.modifyForm.name) {
-				this.$msg('请输入品名称')
+				this.$msg('请输入品名称')
 				return false
 			}
 			let form = JSON.parse(JSON.stringify(this.modifyForm))
@@ -162,11 +129,7 @@ export default {
 			if(form.kindId && Number(form.kindId) > 0){
 				host =  updateKind
 			}
-			if(Number(this.flower) == 2){
-				this.$msg('请选择属性')
-				return false
-			}
-			host({ ...form,flower:this.flower }).then(res => {
+			host({ ...form,flower:1 }).then(res => {
 				if(res.code == 1){
 					this.$msg('操作成功!')
 					this.modalCancel()

+ 2 - 2
hdApp/src/admin/goods/list.vue

@@ -6,7 +6,7 @@
 			</view>
 			<view style="padding-left:10upx;">
         <button class="admin-button-com middle blue" style="margin-right:6upx;" @click="selectFlowerNumFn()">按支数查</button>
-        <button class="admin-button-com middle blue" style="margin-right:6upx;" @click="addGoods()">新增花束花篮</button>
+        <button class="admin-button-com middle blue" style="margin-right:6upx;" @click="addGoods()">新增花束</button>
 			</view>
 		</view>
     <view class="app-middle">
@@ -174,7 +174,7 @@ export default {
         this.$util.pageTo({ url: "/admin/goods/detail", query: { id: id } })
     },
     getCategoryData() {
-      categoryListInfo().then(res => {
+      categoryListInfo({flower:1}).then(res => {
         this.tabbar = res.data;
         if(this.tabbar && this.tabbar[0] && this.tabbar[0].id){
           this.catId = this.tabbar[0].id

+ 361 - 0
hdApp/src/admin/goods/lz.vue

@@ -0,0 +1,361 @@
+<template>
+  <view class="app-content">
+		<view class="input-wrap" >
+			<view class="search-bar">
+				<app-search-module v-model="py" placeholder="这里搜索" @input="searchFn" />
+			</view>
+			<view style="padding-left:10upx;">
+        <button class="admin-button-com middle blue" style="margin-right:6upx;" @click="addGoods()">新增绿植</button>
+			</view>
+		</view>
+    <view class="app-middle">
+      <scroll-view scroll-y scroll-with-animation class="tab-view" :scroll-top="scrollTop">
+        <view v-for="(item,index) in tabbar" :key="index" class="tab-bar-item" :class="[currentTab==index ? 'active' : '']" :data-current="index" @tap.stop="swichTab($event ,item)" >
+          <text>{{item.categoryName || ''}}</text>
+        </view>
+      </scroll-view>
+      <block v-for="(item,index) in tabbar" :key="index">
+        <scroll-view scroll-y class="right-box" v-if="currentTab==index" @scrolltolower="goBottom">
+          <block v-if="!$util.isEmpty(list.data)">
+            <view class="page-view">
+              <view class="goods-list" v-for="(goodsItem, idx) in list.data" :key="idx">
+                <view class="goods-list-top" @click="edit(goodsItem.id)">
+                  <view class="img-blo">
+
+                    <view v-if="goodsItem.status == 0" class="sold-out">
+                      <view class="sold-out-xj">已下架</view>
+                    </view>
+
+                    <img :src="goodsItem.smallCover" mode="aspectFit" />
+                  </view>
+                  <view class="goods-det">
+                    <view class="goods-det-top" style="margin-bottom:4upx;">
+                      <view class="goods-name" style="font-size:29upx;font-weight:bold;	overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width:350upx;">{{ goodsItem.name||'' }}</view>
+                    </view>
+                    <view class="operate-wrap" style="margin-bottom:15upx;">
+                      <view class="goods-price" style="font-size:23upx;">¥{{ goodsItem.price?parseFloat(goodsItem.price):0 }}</view>
+                    </view>
+                    <view class="operate-wrap">
+                      <view style="font-size:23upx;">
+                        <text>库存</text> <text style="font-weight:bold;margin-left:8upx;">{{goodsItem.stock}}</text>
+                        <text style="margin-left:18upx;color:#CCCCCC;">已售 {{ goodsItem.actualSold }}</text>
+                      </view>
+                    </view>
+                  </view>
+                </view>
+                <view class="goods-list-bottom flex-center-between">
+                  <text @click.stop="moreToDo(goodsItem)">更多</text>
+                  <text @click.stop="getSaleRecord">销售记录</text>
+                  <text @click.stop="getStockChange(goodsItem)">库存明细</text>
+                </view>
+              </view>
+            </view>
+          </block>
+          <block v-else>
+            <app-wrapper-empty title="暂无商品" :is-empty="$util.isEmpty(list.data)" />
+          </block>
+        </scroll-view>
+      </block>
+    </view>
+
+    <!--选择支数 -->
+    <uni-popup ref="selectFlowerNumRef" background-color="#fff" type="center" :animation="false">
+      <view style="display:flex;padding:20upx;height:25vh;justify-content: space-between;align-items:center;flex-wrap:wrap;">
+
+        <text v-for="(item, index) in flowerNumList" :key="index" @click="selectFlowerNum(item.num)" 
+        style="margin-left:25upx;border:1upx solid #999999;width:100upx;height:100upx;border-radius:20upx;justify-content:center;align-items:center;display:flex;">
+          {{item.name}}
+        </text>
+
+      </view>
+    </uni-popup>
+
+  </view>
+</template>
+<script>
+import AppSearchModule from "@/components/module/app-search"
+import OperateModule from "@/admin/home/components/module/operate"
+import AppWrapperEmpty from "@/components/app-wrapper-empty"
+import ModalModule from "@/components/plugin/modal"
+import {categoryListInfo,getCategoryToGoods,print} from "@/api/goods"
+import { list } from "@/mixins"
+export default {
+  name: "list",
+  components: {
+    OperateModule,
+    AppWrapperEmpty,
+    ModalModule,
+    AppSearchModule
+  },
+  mixins: [list],
+  data() {
+    return {
+      tabbar: [],
+      height: 0,
+      currentTab: 0,
+      scrollTop: 0,
+      catId: "",
+      delModal: false,
+      operateData: {},
+      operateShow: false,
+      operateIndex: null,
+      operateTop: 0,
+      autoLoad:false,
+      flowerNum:0,
+      flowerNumList:[{num:6,name:6},{num:9,name:9},{num:11,name:11},{num:19,name:19},{num:33,name:33},{num:52,name:52},{num:66,name:66},{num:99,name:99},{num:0,name:'取消'}],
+      py:''
+    };
+  },
+  computed: {
+  },
+  onLoad: function() {
+    this.getCategoryData()
+  },
+  methods: {
+    init(){
+
+    },
+		moreToDo(item){
+			let that=this;
+			let doList = ['打1个标签', '打2个标签','打5个标签', '打10个标签','设置为散花']
+			let doNum = [1,2,5,10,20]
+			uni.showActionSheet({
+				itemList: doList,
+				success: function (respond) {
+					let index = respond.tapIndex
+          if(index == 4){
+            that.$msg('开发中')
+            return
+          }
+          let currentNum = Number(doNum[index])
+          print({id:item.id,num:currentNum}).then(res=>{
+            if(res.code == 1){
+              that.$msg(res.msg)
+            }
+          })
+				}
+			})
+		},
+    searchFn(){
+
+    },
+    selectFlowerNumFn(){
+      this.$refs.selectFlowerNumRef.open('top')
+    },
+    selectFlowerNum(num){
+      this.$refs.selectFlowerNumRef.close()
+      this.flowerNum = num
+      this.resetList();
+      this.getGoodsList();
+    },
+    getSaleRecord(){
+      this.$msg('开发中')
+    },
+    getStockChange(item){
+      this.$util.pageTo({url: "/admin/goods/stockChange?id="+item.id+'&name='+item.name})
+    },
+    goBottom(){
+      if (!this.list.finished) {
+        this.getGoodsList().then((res) => {
+          uni.stopPullDownRefresh();
+        });
+      } else {
+        uni.stopPullDownRefresh();
+      }
+    },
+    addGoods(){
+        this.$util.pageTo({url:"/admin/goods/plantCg"})
+    },
+    cgPlant(){
+      this.$util.pageTo({url:"/admin/goods/plant"})
+    },
+    edit(id){
+        this.$util.pageTo({ url: "/admin/goods/detail", query: { id: id } })
+    },
+    getCategoryData() {
+      categoryListInfo({flower:0}).then(res => {
+        this.tabbar = res.data;
+        if(this.tabbar && this.tabbar[0] && this.tabbar[0].id){
+          this.catId = this.tabbar[0].id
+          this.getGoodsList()
+        }
+      });
+    },
+    getGoodsList() {
+      return getCategoryToGoods({ status:'', page: this.list.page, catId:this.catId,flowerNum:this.flowerNum }).then(res => {
+        this.completes(res)
+      })
+    },
+    swichTab(e, item) {
+      let cur = e.currentTarget.dataset.current;
+      if (this.currentTab == cur) {
+        return false;
+      } else {
+        this.currentTab = cur;
+        this.catId = item.id;
+        this.resetList();
+        this.getGoodsList();
+      }
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.app-content {
+  min-height: calc(100vh - 80upx);
+  background-color: #fff;
+}
+page {
+  background: #fff;
+}
+::-webkit-scrollbar {
+  width: 0;
+  height: 0;
+  color: transparent;
+}
+.tab-view {
+	height: 100vh;
+  width: 200upx;
+  position: fixed;
+  left: 0;
+  z-index: 10;
+  background-color: #f0f2f6;
+  padding-bottom:120upx;
+  .tab-bar-item {
+    width: 200upx;
+    height: 100upx;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 26upx;
+    color: #444;
+    font-weight: 400;
+  }
+  .active {
+    position: relative;
+    color: $mainColor;
+    font-size: 26upx;
+    background: #fff;
+  }
+  .active::before {
+    content: "";
+    position: absolute;
+    border-left: 8upx solid $mainColor;
+    height: 100%;
+    left: 0;
+  }
+}
+.right-box {
+  width: 100%;
+  height:100vh;
+  position: fixed;
+  padding-left:220upx;
+  padding-bottom:120upx;
+  box-sizing: border-box;
+  left: 0;
+  .page-view {
+    width: 100%;
+    overflow: hidden;
+    box-sizing: border-box;
+    padding-bottom: env(safe-area-inset-bottom);
+    .goods-list {
+      margin: 40upx 0;
+      .goods-list-top {
+        position: relative;
+        @include disFlex(flex-start, flex-start);
+      }
+      .goods-list-bottom {
+        width: 96%;
+        margin-top: 16upx;
+        color: #bebebe;
+        text{
+          border:1px solid rgb(218, 216, 216);
+          border-radius: 20upx;
+          font-size:22upx;
+          padding:9upx 25upx 9upx 25upx;
+        }
+      }
+      .img-blo {
+        width: 130upx;
+        height: 130upx;
+        margin-right: 20upx;
+        & > img {
+          height: 100%;
+          width: 100%;
+        }
+
+        .sold-out{
+          z-index:10;
+          width:130upx;
+          height:130upx;
+          background-color:black;
+          position:absolute;
+          top:0;
+          left:0;
+          opacity: 0.5;
+          color:white;
+          text-align:center;
+          .sold-out-xj{
+            line-height:130upx;
+            font-size:24upx;
+          }
+        }
+
+      }
+      .goods-det {
+        width: calc(100% - 150upx);
+        font-size: 28upx;
+        .operate-wrap {
+          @include disFlex(flex-end, space-between);
+        }
+        .operate-icon-wrap {
+          left: -20upx;
+        }
+        .goods-name {
+          margin-bottom: 10upx;
+        }
+        .goods-sales {
+          color: $fontColor3;
+          font-size: 24upx;
+        }
+        .goods-price {
+          color: #ff2842;
+          font-weight: bold;
+        }
+      }
+    }
+  }
+}
+.app-footer {
+  justify-content: space-between;
+  .btn-list {
+    width: 100%;
+    &:first-child {
+      border-left: 0;
+    }
+    .admin-button-com {
+      width: 160upx;
+      padding-top: 16upx;
+      padding-bottom: 16upx;
+      float:right;
+      margin-right:30upx;
+    }
+  }
+  .other-btn {
+    color: $fontColor2;
+    .iconfont {
+      font-size: 24upx;
+      color: $fontColor3;
+      transform: scale(0.4);
+    }
+  }
+}
+.input-wrap {
+		display: flex;
+		padding: 22upx 20upx 22upx 13upx;
+		.search-bar {
+			flex: 1;
+		}
+	}
+</style>

+ 240 - 0
hdApp/src/admin/goods/lzKind.vue

@@ -0,0 +1,240 @@
+<template>
+	<view class="app-content">
+		<view class="list-wrap">
+			<block v-if="!$util.isEmpty(list.data)">
+				<view class="list" v-for="(item, index) in list.data" :key="index">
+					<view class="list-img">
+						<image :src="`${constant.imgUrl}/default-img.png`" mode="aspectFit" ></image>
+					</view>
+					<view class="list-det" @click="edit(item)">
+						<view class="app-size-28 app-color-0" style="font-size:35upx;">{{ item.name}}</view>
+						<view class="list-operate">
+							<view class="operate-det">
+								<span @click.stop="delKind(item.id)">删除</span>
+								<span @click.stop="edit(item)">编辑</span>
+							</view>
+						</view>
+					</view>
+				</view>
+			</block>
+			<block v-else>
+				<app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
+			</block>
+		</view>
+
+		<view class="app-footer">
+			<button class="admin-button-com big blue" @click="addKindFn">添加品种</button>
+		</view>
+
+		<modal-module :show="modifyModal" :maskClosable="false" @cancel="modalCancel" @click="modifyModalClick" width="92%" :title="modifyTitle" padding="30rpx 30rpx">
+			<template v-slot:content>
+				<view class="app-modal-input-wrap modify-modal">
+					<view class="inp-list-line">
+						<view class="line-label">名称</view>
+						<view class="line-input">
+							<input type="text" v-model="modifyForm.name" :adjust-position="false" class="inp-input" placeholder="请填写" />
+						</view>
+					</view>
+					<view class="inp-list-line">
+						<view class="line-label">排序</view>
+						<view class="line-input">
+							<input type="number" v-model="modifyForm.inTurn" @focus="modifyForm.inTurn=''" :adjust-position="false" class="inp-input" placeholder="值越大越靠前" />
+						</view>
+					</view>
+				</view>
+			</template>
+		</modal-module>
+	</view>
+</template>
+<script>
+import ModalModule from '@/components/plugin/modal'
+import AppUploader from '@/components/app-uploader'
+import OperateModule from '@/admin/home/components/module/operate'
+import AppWrapperEmpty from '@/components/app-wrapper-empty'
+import { list } from '@/mixins'
+import { addKind, updateKind } from '@/api/goods'
+import { getKindList } from '@/api/kind'
+export default {
+	name: 'kind',
+	components: {
+		ModalModule,
+		AppUploader,
+		OperateModule,
+		AppWrapperEmpty
+	},
+	mixins: [list],
+	data() {
+		return {
+			modifyModal: false,
+			modifyTitle: '添加',
+			modifyForm: {
+				kindId:0,
+				name: '',
+				inTurn: '',
+				status: 1
+			},
+			delModal: false,
+			operateData: {},
+			operateIndex: null,
+			operateTop: 0,
+			catDisabled:false
+		}
+	},
+	onPullDownRefresh() {
+		this.resetList()
+		this.getKindData().then(res => {
+			uni.stopPullDownRefresh()
+		})
+	},
+	onReachBottom() {
+		if (!this.list.finished) {
+			this.getKindData().then(res => {
+				uni.stopPullDownRefresh()
+			})
+		} else {
+			uni.stopPullDownRefresh()
+		}
+	},
+	methods: {
+		edit(item){
+			this.modifyModal = true
+			this.modifyTitle = '编辑'
+			this.modifyForm = { kindId:item.id, name: item.name, inTurn: item.inTurn }
+			this.catDisabled = true
+		},
+		addKindFn() {
+			this.resetForm()
+			this.modifyModal = true
+			this.modifyTitle = '新增'
+			this.catDisabled = false
+		},
+		resetForm() {
+			this.modifyForm = {kindId:0, name: '', inTurn: '', status: 1 }
+		},
+		async init() {
+			this.getKindData()
+		},
+		getKindData() {
+			return getKindList({page:this.list.page,flower:0}).then(res => {
+				this.completes(res)
+			})
+		},
+		kindAddOrEdit() {
+			if (!this.modifyForm.name) {
+				this.$msg('请输入品种名称')
+				return false
+			}
+			let form = JSON.parse(JSON.stringify(this.modifyForm))
+			let host = addKind
+			if(form.kindId && Number(form.kindId) > 0){
+				host =  updateKind
+			}
+			host({ ...form,flower:0 }).then(res => {
+				if(res.code == 1){
+					this.$msg('操作成功!')
+					this.modalCancel()
+					setTimeout(() => {
+						this.resetList()
+						this.getKindData()
+					}, 1000)
+				}
+			})
+		},
+		modifyModalClick(e) {
+			if (e.index === 0) {
+				this.modalCancel()
+			} else {
+				this.kindAddOrEdit()
+			}
+		},
+		modalCancel() {
+			this.delModal = false
+			this.modifyModal = false
+		},
+		delKind() {
+			this.$msg('开发中')
+		}
+	}
+}
+</script>
+<style lang="scss" scoped>
+.app-content {
+	min-height: calc(100vh - 100upx);
+	padding-bottom: 100upx;
+}
+.list-wrap {
+	position: relative;
+	background-color: #fff;
+	.list {
+		height: 160upx;
+		@include disFlex(center, flex-start);
+		padding: 30upx 0;
+		margin: 0 30upx;
+		color: $fontColor3;
+		border-bottom: 1px solid $borderColor;
+		.list-index {
+			width: 50upx;
+		}
+		.list-img {
+			width: 130upx;
+			height: 130upx;
+			image {
+				width:130upx;
+				height:130upx;
+				border-radius: 20upx;
+			}
+		}
+		.list-det {
+			//width: calc(100% - 200upx);
+			margin-left: 20upx;
+			& > div {
+				margin-top: 14upx;
+				&:first-child {
+					margin-top: 0;
+				}
+			}
+			.list-operate {
+				width:480upx;
+				@include disFlex(center, space-between);
+				.operate-det {
+					width:auto;
+					padding-left:150upx;
+					& > span {
+						border:1px solid #ccc;
+						border-radius:25upx;
+						padding:5upx 20upx 5upx 20upx;
+						font-size:25upx;
+						margin-left:70upx;
+						&:first-child {
+							margin-left: 0;
+						}
+					}
+				}
+			}
+		}
+	}
+}
+.app-footer {
+	justify-content: flex-end;
+	.admin-button-com {
+		width: 200upx;
+		margin-right: 30upx;
+	}
+}
+.modify-modal {
+	.prompt-text {
+		color: red;
+		position: relative;
+		right: 52upx;
+		bottom: 24upx;
+		// margin-bottom: 10upx;
+	}
+	.line-label {
+		width: 140upx;
+		flex-shrink: 0;
+	}
+	.switch-wrap {
+		margin-top: 30upx;
+	}
+}
+</style>

+ 1 - 1
hdApp/src/admin/goods/plantCg.vue

@@ -10,7 +10,7 @@
         <AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)"/>
       </block>
     <view class="app-footer open_btn">
-      <view @click="addNewEvent" class="admin-button-com big blue" style="margin-right:60upx;">新商品采购</view>
+      <view @click="addNewEvent" class="admin-button-com big blue" style="margin-right:60upx;">新绿植采购</view>
       <view @click="addOldEvent" class="admin-button-com big blue">新增采购</view>
 		</view>
   </view>

+ 7 - 6
hdApp/src/admin/home/apply.vue

@@ -40,14 +40,13 @@ export default {
         {
             title:'商品',
             list:[
-                { name: "商品", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/list",pf:1},
+                { name: "花束", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/list",pf:1},
+                { name: "花束品种", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/kind",pf:1},
+                { name: "绿植", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/lz",pf:1},
+                { name: "绿植品种", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/lzKind",pf:1},
                 { name: "商城分类", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/category",pf:1},
-                { name: "品类", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/kind",pf:1},
                 { name: "涨价设置", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/price-increase",pf:1},
-                { name: "运费规则", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/freight",pf:1},
                 { name: "商品盘点", img: `${this.$constant.imgUrl}/ghs/home/pandian.png`, url: "/admin/goods/pdList",pf:1},
-                { name: "商城", img: `${this.$constant.imgUrl}/ghs/home/shop.png`, url: "/admin/cg/mall",pf:1},
-                { name: "开关商城", img: `${this.$constant.imgUrl}/ghs/home/shop.png`, url: "/pagesPurchase/open",pf:1}
             ]
         },
         {
@@ -72,7 +71,9 @@ export default {
             { name: "已屏蔽", img: `${this.$constant.imgUrl}/ghs/home/icon_ghs.png`, url: "/pagesPurchase/pb",pf:1},
             { name: "采购单", img: `${this.$constant.imgUrl}/ghs/home/icon_caigou.png`, url: "/pagesPurchase/shopping",pf:1},
             { name: "损耗", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/breakage/list",pf:1},
-            { name: "拆散", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/part/list",pf:1}
+            { name: "拆散", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/part/list",pf:1},
+            { name: "商城", img: `${this.$constant.imgUrl}/ghs/home/shop.png`, url: "/admin/cg/mall",pf:1},
+            { name: "开关商城", img: `${this.$constant.imgUrl}/ghs/home/shop.png`, url: "/pagesPurchase/open",pf:1}
           ]
         },
         {

+ 3 - 3
hdApp/src/admin/home/workbench.vue

@@ -240,9 +240,9 @@ export default {
         { name: "供货商", img: `${this.$constant.imgUrl}/ghs/home/icon_ghs.png`, url: "/pagesPurchase/order",pf:1 },
         { name: "花材采购", img: `${this.$constant.imgUrl}/ghs/home/icon_caigou.png`, url: "/pagesPurchase/shopping",pf:1 },
         { name: "采购结账", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/clear/list",pf:1 },
-        { name: "商品", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/list",pf:1 },
-        { name: "商品采购", img: `${this.$constant.imgUrl}/ghs/home/icon_caigou.png`, url: "/admin/goods/plantCg",pf:1},
-        { name: "品类", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/kind",pf:1},
+        { name: "花束", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/list",pf:1 },
+        { name: "绿植", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/lz",pf:1 },
+        { name: "绿植采购", img: `${this.$constant.imgUrl}/ghs/home/icon_caigou.png`, url: "/admin/goods/plantCg",pf:1}
       ],
       totalData: [
         { name: "客户数", value: 0 },

+ 1 - 1
hdApp/src/admin/order/workOrder.vue

@@ -7,7 +7,7 @@
        <view class="module-com input-line-wrap" style="position:relative;">
 
         <tui-list-cell class="line-cell" :arrow="true">
-          <view class="tui-title required">品</view>
+          <view class="tui-title required">品</view>
           <picker mode="selector" :value="form.kindId" :range="kindListData" range-key="name" @change="changeKindFn" class="tui-input" >
             <input v-model="form.kindId" name="kindId" type="text" hidden />
             <view v-if="form.kindId" style="height:45upx;" >{{ kindSelectedData.name }}</view>

+ 6 - 4
hdApp/src/pages.json

@@ -237,9 +237,11 @@
 		{
 			"root": "admin/goods",
 			"pages": [
-				{ "path": "list", "style": { "navigationBarTitleText": "商品列表" } },
+				{ "path": "list", "style": { "navigationBarTitleText": "花束" } },
+				{ "path": "lz", "style": { "navigationBarTitleText": "绿植" } },
 				{ "path": "category", "style": { "navigationBarTitleText": "分类" } },
-				{ "path": "kind", "style": { "navigationBarTitleText": "品类" } },
+				{ "path": "kind", "style": { "navigationBarTitleText": "花束品类" } },
+				{ "path": "lzKind", "style": { "navigationBarTitleText": "绿植品类" } },
 				{ "path": "detail", "style": { "navigationBarTitleText": "商品详情" } },
 				{ "path": "add", "style": { "navigationBarTitleText": "新增" } },
 				{ "path": "selectItem", "style": { "navigationBarTitleText": "选择花材" } },
@@ -253,11 +255,11 @@
 				{ "path": "flowerResult", "style": { "navigationBarTitleText": "结果" } },
 				{ "path": "plantConfirm", "style": { "navigationBarTitleText": "确认采购" } },
 				{ "path": "plantResult", "style": { "navigationBarTitleText": "结果" } },
-				{ "path": "cgNewPlant", "style": { "navigationBarTitleText": "新商品采购" } },
+				{ "path": "cgNewPlant", "style": { "navigationBarTitleText": "新绿植采购" } },
 				{ "path": "selectKind", "style": { "navigationBarTitleText": "选择品类" } },
 				{ "path": "cgNewPlantResult", "style": { "navigationBarTitleText": "采购成功" } },
 				{ "path": "stockChange", "style": { "navigationBarTitleText": "库存变动记录" } },
-				{ "path": "plantCg", "style": { "navigationBarTitleText": "商品采购记录" } },
+				{ "path": "plantCg", "style": { "navigationBarTitleText": "绿植采购记录" } },
 				{ "path": "plantCgDetail", "style": { "navigationBarTitleText": "明细" } },
 				{ "path": "pdList", "style": { "navigationBarTitleText": "商品盘点列表" } },
 				{ "path": "pdGoods", "style": { "navigationBarTitleText": "选择商品" } },

+ 1 - 1
hdPad/src/pages/home/components/createWork.vue

@@ -7,7 +7,7 @@
             </view>
 
           <view class="item">
-            <text class="left">品</text>
+            <text class="left">品</text>
             <view class="class-item-list">
                 <view v-for="info in kindList" :class="[form.kindId===info.id?'selected':'']" @click="setKind(info)" :key="info.id">{{info.name}}</view>
             </view>

+ 1 - 1
hdPad/src/pages/home/components/rightGoods.vue

@@ -1,7 +1,7 @@
 <template>
     <view class="shop-listType_box">
         <view class="cat-list-area">
-            <view :class="[flower==0?'active':'']" @click="changeKind(0)">绿植花瓶</view>
+            <view :class="[flower==0?'active':'']" @click="changeKind(0)">绿植盆栽</view>
             <view :class="[flower==1?'active':'']" @click="changeKind(1)">花束花篮</view>
         </view>
         <view class="num-area" v-if="flower==1">