零售 首页优化

ghsApp/src/admin/item/copy.vue

@@ -31,7 +31,7 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">单支价格系数</view>
+          <view class="tui-title">单支售价系数</view>
           <input v-model="form.smallRatio" placeholder-class="phcolor" class="tui-input" name="smallRatio" placeholder="请填写" style="width:230upx;" @focus="form.smallRatio=''"
           maxlength="50" type="number" /><text style="color:#CCCCCC;">¥<text>{{smallPrice}}</text></text>
         </tui-list-cell>
@@ -467,7 +467,7 @@ export default {
         {
           name: "smallRatio",
           rule: ["required"],
-          msg: ["请填写单支价格系数"]
+          msg: ["请填写单支售价系数"]
         },
         {
           name: "price",

ghsApp/src/admin/item/detail.vue

@@ -30,9 +30,9 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">单支价格系数</view>
+          <view class="tui-title">单支售价系数</view>
           <input v-model="form.smallRatio" placeholder-class="phcolor" class="tui-input" name="smallRatio" placeholder="请填写" style="width:200upx;" @focus="form.smallRatio=''" maxlength="50" type="number" />
-          <text style="color:#CCCCCC;">拆散单支价 ¥<text>{{smallPrice}}</text></text>
+          <text style="color:#CCCCCC;">单支售价 ¥<text>{{smallPrice}}</text></text>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
@@ -483,7 +483,7 @@ export default {
         {
           name: "smallRatio",
           rule: ["required"],
-          msg: ["请填写单支价格系数"]
+          msg: ["请填写单支售价系数"]
         },
         {
           name: "price",

ghsApp/src/pagesOrder/detail.vue

@@ -115,7 +115,7 @@
 				<view class="commodity-view">
 					<view class="commodity-list">
 						<view v-for="(s, idx) in detailInfo.product" :key="idx" class="commodity-item" >
-							<image class="item-icon" :src="s.cover" @click="pageTo({url:'/admin/item/detail',query:{id: s.id}})" />
+							<image class="item-icon" :src="s.cover" @click="pageTo({url:'/admin/item/detail',query:{id: s.productId}})" />
 							<view class="item-info">
 								<view class="info-line">
 									<text class="item-name">{{ s.name }}</text>

hdApp/src/admin/home/apply.vue

@@ -29,13 +29,13 @@ export default {
     return {
       menuList: [
         {
-            title:'商品花材',
+            title:'成品花材',
             list:[
                 {name: "花材",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/item/list",pf:1},
                 {name: "停用花材",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/item/list?delStatus=1",pf:1},
                 {name: "花材分类",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/itemClass/list",pf:1},
-                { name: "盆栽花束", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goodsManage/list",pf:1},
-                { name: "商品分类", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goodsManage/category",pf:1},
+                { name: "成品", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goodsManage/list",pf:1},
+                { name: "成品分类", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goodsManage/category",pf:1},
                 { name: "涨价设置", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goodsManage/price-increase",pf:1},
                 { name: "运费规则", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goodsManage/freight",pf:1}
             ]

hdApp/src/admin/home/components/order-item.vue

@@ -6,11 +6,9 @@
 					<image :src="info.cover" mode="aspectFit"></image>
 				</view>
 				<view class="list-msg">
-					<view><text>收花：</text><text>{{info.receiveUserName||''}}</text></view>
-					<view style="margin-top:3upx;"><text>电话：</text><text>{{info.receiveMobile||''}}</text></view>
 					<view style="margin-top:3upx;"><text>时间：</text><text>{{info.addTime.substr(5,11)}}</text></view>
+					<view><text>收花：</text><text>{{info.receiveUserName||''}}</text></view>
 					<view style="margin-top:3upx;"><text>数量：</text><text></text></view>
-					<view style="margin-top:3upx;"><text>下单：</text><text>{{info.bookName||''}}</text></view>
 					<view style="margin-top:3upx;"><text>备注：</text><text>{{info.remark||''}}</text></view>
 				</view>
 			</view>
@@ -43,12 +41,12 @@ export default {
 		.image {
 			position: relative;
 			image{
-				width:140upx;
-				height:140upx;
+				width:120upx;
+				height:120upx;
 				border-radius:6upx;
 				position: absolute;
 				top:0upx;
-				left:550upx;
+				left:565upx;
 			}
 		}
 		.list-msg {

hdApp/src/admin/home/workbench.vue

@@ -96,12 +96,14 @@ export default {
         { name: "工单", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/work/list",pf:1 },
         { name: "采购单", img: `${this.$constant.imgUrl}/ghs/home/icon_caigou.png`, url: "/pagesPurchase/shopping",pf:0 },
         { name: "供应商", img: `${this.$constant.imgUrl}/ghs/home/icon_ghs.png`, url: "/pagesPurchase/order",pf:0 },
-        { name: "盆栽花束", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goodsManage/list",pf:1 },
-        { name: "花材", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/item/list",pf:1 },
         { name: "改价", img: `${this.$constant.imgUrl}/ghs/home/gj.png`, url: "/admin/changePrice/list",pf:0},
         { name: "报损单", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/breakage/list",pf:1},
         { name: "员工", img: `${this.$constant.imgUrl}/ghs/home/yggl.png`, url: "/admin/staff/list",pf:0 },
         { name: "采购结账单", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/clear/list",pf:0 },
+        { name: "花材", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/item/list",pf:1 },
+        { name: "花材分类", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/itemClass/list",pf:1},
+        { name: "成品", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goodsManage/list",pf:1 },
+        { name: "成品分类", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goodsManage/category",pf:1},
       ],
       totalData: [
         { name: "客户数", value: 0 },

hdApp/src/admin/item/detail.vue

@@ -24,9 +24,9 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">单支价格系数</view> 
+          <view class="tui-title">单支售价系数</view> 
           <input v-model="form.smallRatio" placeholder-class="phcolor" class="tui-input" name="smallRatio" style="width:200upx;" @focus="form.smallRatio=''" placeholder="请填写" maxlength="30" type="number" />
-           <text style="color:#CCCCCC;">拆散单支价 ¥<text>{{smallPrice}}</text></text>
+           <text style="color:#CCCCCC;">单支售价 ¥<text>{{smallPrice}}</text></text>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
@@ -414,7 +414,7 @@ export default {
         {
           name: "smallRatio",
           rule: ["required"],
-          msg: ["请填写单支价格系数"]
+          msg: ["请填写单支售价系数"]
         },
         {
           name: "skAddPrice",

hdApp/src/admin/order/detail.vue

@@ -1,13 +1,5 @@
 <template>
   <view class="app-content">
-    <view class="page-top">
-      <view class="page-top-img">
-        <img :src="`${constant.imgUrl}/retail/order/bg.png`" mode="widthFix" />
-      </view>
-      <view class="page-top-det">
-        <view> <view class="page-status">{{orderInfo.status == 1?'待付款':orderInfo.status==2?'待配送':orderInfo.status == 3?'配送中':orderInfo.status ==4?'已完成':orderInfo.status == 5?'已取消':'待付款'}}</view> </view>
-      </view>
-    </view>
     <view class="page-det">
       <view class="module-com">
         <view class="module-tit">商品信息</view>
@@ -63,6 +55,10 @@
         </view>
         <view class="module-det">
           <view class="order-msg-blo">
+            <view class="msg-list">
+              <view class="label">状态：</view>
+              <view class="value">{{orderInfo.status == 1?'待付款':orderInfo.status==2?'待配送':orderInfo.status == 3?'配送中':orderInfo.status ==4?'已完成':orderInfo.status == 5?'已取消':'待付款'}}</view>
+            </view>
             <view class="msg-list">
               <view class="label">单号：</view>
               <view class="value">{{ orderInfo.orderSn||'' }}</view>
@@ -178,7 +174,7 @@ export default {
   width: 94%;
   margin: 0 auto;
   position: relative;
-  top: -40upx;
+  top: 20upx;
   .order-msg {
     .order-msg-blo {
       font-size: 28upx;

hdApp/src/api/category/index.js

@@ -17,35 +17,35 @@ export const getList = data => {
 // =====================  B 端 ========================
 
 /** *
- * 商品分类-列表（全部分类无分页） b
+ * 成品分类-列表（全部分类无分页） b
  */
 export const getClassB = data => {
 	return https.get('/category/list', data)
 }
 
 /** *
- * 商品分类-查看 b
+ * 成品分类-查看 b
  */
 export const getClassDetB = data => {
 	return https.get('/category/detail', data)
 }
 
 /** *
- * 商品分类-添加 b
+ * 成品分类-添加 b
  */
 export const classAddB = data => {
 	return https.get('/category/add', data)
 }
 
 /** *
- * 商品分类-修改 b
+ * 成品分类-修改 b
  */
 export const classUpdateB = data => {
 	return https.get('/category/update', data)
 }
 
 /** *
- * 商品分类-修改 b
+ * 成品分类-修改 b
  */
 export const changeStatusB = data => {
 	return https.get('/category/change-status', data)

hdApp/src/api/goods/index.js

@@ -85,42 +85,42 @@ export const usageListB = data => {
 }
 
 /** *
- * 商品分类-列表（无分页） b
+ * 成品分类-列表（无分页） b
  */
 export const categoryListB = data => {
 	return https.get('/category/list', data)
 }
 
 /** *
- * 商品分类-查看 b
+ * 成品分类-查看 b
  */
 export const categoryDetB = data => {
 	return https.get('/category/detail', data)
 }
 
 /** *
- * 商品分类-添加 b
+ * 成品分类-添加 b
  */
 export const categoryAddB = data => {
 	return https.post('/category/add', data)
 }
 
 /** *
- * 商品分类-更新 b
+ * 成品分类-更新 b
  */
 export const categoryUpdateB = data => {
 	return https.post('/category/update', data)
 }
 
 /** *
- * 商品分类-更新 b
+ * 成品分类-更新 b
  */
 export const categoryDelB = data => {
 	return https.get('/category/delete', data)
 }
 
 /** *
- * 商品分类-启用停用 b
+ * 成品分类-启用停用 b
  */
 export const categoryStatusB = data => {
 	return https.get('/category/change-status', data)