花材列表页

ghsApp/src/admin/billing/index.vue

@@ -3,18 +3,25 @@
 	<view class="billing_box_bg">
 		<view class="input-wrap" >
 			<view style="padding:0upx 0upx 0upx 0upx;margin-right:10upx;" >
-				<button class="admin-button-com middle blue" @click="selectFlowerNumFn()">选分类</button>
+				<button class="admin-button-com middle blue" @click="selectFlowerNumFn()">图片分类</button>
 			</view>
 			<view class="search-bar">
 				<app-search-module v-model="py" placeholder="输入拼音首字母搜索" @input="searchFn" />
 			</view>
-			<view style="float:right">
+			<view style="float:right;">
 				<button class="admin-button-com middle blue" @click="removeFromSave(option.customId)">清除花材</button>
 			</view>
 		</view>
 
 		<view class="scroll-middle_bx">
 
+			<scroll-view scroll-y scroll-with-animation class="tab-view">
+				<!--分类-->
+				<div v-for="(item, index) in globalClassItemList" :key="index" class="tab-bar-item" :class="classIndex == index ? 'active' : ''" :data-current="index" @tap.stop="swichClass(index)">
+					<text>{{ item.className || "" }}</text>
+				</div>
+				<view style="height: 120upx"></view>
+			</scroll-view>
 			<scroll-view scroll-y class="right-box" :scroll-into-view="scroll_into_view" scroll-with-animation="true" @scroll="scroll_detail" lower-threshold="100" @scrolltolower="scroll_bottom">
 				<!--花材列表-->
 				<block v-if="!$util.isEmpty(globalClassItemList)">

ghsApp/src/admin/breakage/index.vue

@@ -3,10 +3,10 @@
 	<view class="billing_box_bg">
 		<view class="input-wrap" >
 			<view style="padding:0upx 0upx 0upx 0upx;margin-right:10upx;" >
-				<button class="admin-button-com middle blue" @click="selectFlowerNumFn()">选分类</button>
+				<button class="admin-button-com middle blue" @click="selectFlowerNumFn()">图片分类</button>
 			</view>
 			<view class="search-bar">
-				<app-search-module v-model="py" placeholder="输入拼音首字母搜索" @input="searchFn" />
+				<app-search-module v-model="py" placeholder="输拼音首字母也可以搜" @input="searchFn" />
 			</view>
 			<view style="float:right">
 				<button class="admin-button-com middle blue" @click="removeFromSave(0)">清除花材</button>
@@ -15,6 +15,15 @@
 		
 		<view class="scroll-middle_bx">
 
+			<scroll-view scroll-y scroll-with-animation class="tab-view">
+				<!--分类 start -->
+				<div v-for="(item, index) in globalClassItemList" :key="index" class="tab-bar-item" :class="classIndex == index ? 'active' : ''" :data-current="index" @tap.stop="swichClass(index)">
+					<text>{{ item.className || "" }}</text>
+				</div>
+				<!--分类 end -->
+				<view style="height: 120upx"></view>
+			</scroll-view>
+
 			<scroll-view scroll-y class="right-box" :scroll-into-view="scroll_into_view" scroll-with-animation="true" @scroll="scroll_detail" lower-threshold="100" @scrolltolower="scroll_bottom">
 				<!--花材列表 start -->
 				<block v-if="!$util.isEmpty(globalClassItemList)">

ghsApp/src/admin/changePrice/components/Item.vue

@@ -191,7 +191,7 @@ export default {
 					width:190upx;
 					position: absolute;
 					top:30upx;
-					right:160upx;
+					right:-10upx;
 					.change-input {
 						width: 150upx;
 						height: 60upx;
@@ -211,8 +211,8 @@ export default {
 				.sk-price-area{
 					width:190upx;
 					position: absolute;
-					top:30upx;
-					right:-20upx;
+					top:100upx;
+					right:-10upx;
 					.change-input {
 						width: 150upx;
 						height: 60upx;

ghsApp/src/admin/changePrice/list.vue

@@ -3,7 +3,7 @@
 	<view class="billing_box_bg">
     <view class="input-wrap">
 			<view style="padding:0upx 0upx 0upx 0upx;margin-right:10upx;" >
-				<button class="admin-button-com middle blue" @click="selectFlowerNumFn()">选分类</button>
+				<button class="admin-button-com middle blue" @click="selectFlowerNumFn()">图片分类</button>
 			</view>
 			<view class="search-bar">
 				<app-search-module v-model="py" placeholder="输入拼音首字母搜索" @input="searchFn"/>
@@ -14,6 +14,11 @@
 		</view>
 
 		<view class="scroll-middle_bx">
+			<scroll-view scroll-y scroll-with-animation class="tab-view" :scroll-top="scrollTop">
+				<div v-for="(item, index) in globalClassItemList" :key="index" class="tab-bar-item" :class="[classIndex == index ? 'active' : '']" :data-current="index" @tap.stop="swichClass(index)">
+					<text>{{ item.className || "" }}</text>
+				</div>
+			</scroll-view>
 				<scroll-view scroll-y class="right-box" 
 					:scroll-into-view="scroll_into_view" 
 					scroll-with-animation="true"

ghsApp/src/admin/item/components/ItemStock.vue

@@ -89,7 +89,7 @@ export default {
 	font-size:22upx;
 	border-radius: 20upx;
 	padding:12upx 23upx 12upx 23upx;
-	margin:0 50upx 0 0;
+	margin:0 20upx 0 0;
 	float:right;
 	color:#aaa9a9;
 }

ghsApp/src/admin/item/list.vue

@@ -3,17 +3,21 @@
 		<view class="billing_box_bg">
 			<view class="input-wrap">
 				<view style="padding:0upx 0upx 0upx 0upx;margin-right:10upx;" >
-					<button class="admin-button-com middle blue" @click="selectFlowerNumFn()">选分类</button>
+					<button class="admin-button-com middle blue" @click="selectFlowerNumFn()">图片分类</button>
 				</view>
 				<view class="search-bar">
-					<app-search-module v-model="py" placeholder="输拼音首字母也可以搜索" @input="searchFn"/>
+					<app-search-module v-model="py" placeholder="输拼音首字母也可以搜" @input="searchFn"/>
 				</view>
 				<view style="padding:0 0upx 0 20upx;" >
 					<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">
+					<div v-for="(item, index) in globalClassItemList" :key="index" class="tab-bar-item" :class="[classIndex == index ? 'active' : '']" :data-current="index" @tap.stop="swichClass(index)">
+						<text>{{ item.className || "" }}</text>
+					</div>
+				</scroll-view>
 					<scroll-view scroll-y class="right-box" :scroll-into-view="scroll_into_view" scroll-with-animation="true"
 							@scroll="scroll_detail" lower-threshold="100" @scrolltolower="scroll_bottom">
 

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

@@ -17,8 +17,8 @@
 						</text>
 						<i class="iconfont iconzeng" @click.stop="addItemFn()"></i>
 					</view>
-					<text v-if="Number(info.stock) > Number(info.stockWarning)" style="padding-right:90upx;color:#333;">还剩 {{ parseFloat(info.stock) }}</text>
-					<text v-else style="padding-right:90upx;color:red;font-weight:450;">还剩 {{ parseFloat(info.stock) }}</text>
+					<text v-if="Number(info.stock) > Number(info.stockWarning)" style="color:#333;margin-right:65upx;">还剩 {{ parseFloat(info.stock) }}</text>
+					<text v-else style="color:red;font-weight:bold;margin-right:65upx;">还剩 {{ parseFloat(info.stock) }}</text>
 				</view>
 			</view>
 		</view>
@@ -163,7 +163,7 @@ export default {
 				align-items: center;
 				& .iconfont {
 					color: #3385ff;
-					font-size: 72upx;
+					font-size: 55upx;
 				}
 				.position{
 					display: block;
@@ -179,15 +179,15 @@ export default {
 				}
 				& > .num {
 					display: inline-block;
-					width: 140upx;
-					height:60upx;
-					line-height:60upx;
+					width: 100upx;
+					height:50upx;
+					line-height:50upx;
 					text-align:center;
 					margin: 0 20upx;
 					color: #868686;
 					border-radius: 22upx;
 					background-color: #f5f5f5;
-					font-size: 33upx;
+					font-size: 28upx;
 				}
 				.change-input {
 					width: 164upx;

ghsApp/src/config.js

@@ -1,4 +1,4 @@
 export const ProjectName = 'ghs'
-export const APIHOST = 'https://api.shop.hzghd.com'
-export const IMGHOST = 'https://img.hzghd.com'
-export const CURRENT_ENV = 'dev'
+export const APIHOST = 'https://api.shop.wixhb.com'
+export const IMGHOST = 'https://img.wixhb.com'
+export const CURRENT_ENV = 'production'

ghsApp/src/ext.json

@@ -1,12 +1,12 @@
 {
   "extEnable": true,
-  "extAppid": "wx21b7c3ef12082099",
+  "extAppid": "wxcf32b3f0684c2433",
   "directCommit": false,
   "ext": {
-    "account": 12362,
-    "apiHost": "https://api.shop.hzghd.com",
-    "socketApiHost": "api.shop.hzghd.com",
-    "imgHost": "https://img.hzghd.com",
-    "name":"花掌柜"
+    "account": 12358,
+    "apiHost": "https://api.shop.wixhb.com",
+    "socketApiHost": "api.shop.wixhb.com",
+    "imgHost": "https://img.wixhb.com",
+    "name":"销花宝"
   }
 }

ghsApp/src/manifest.json

@@ -64,7 +64,7 @@
                     "entitlements" : {
                         "com.apple.developer.associated-domains" : [ "applinks:fronttg.wixhb.com" ]
                     }
-                }          
+                }
             },
             /* SDK配置 */
             "sdkConfigs" : {
@@ -163,10 +163,13 @@
     "quickapp" : {},
     /* 小程序特有相关 线上（销花宝） wxcf32b3f0684c2433 开发（花掌柜） wx21b7c3ef12082099 */
     "mp-weixin" : {
-        "appid" : "wx21b7c3ef12082099",
+        "appid" : "wxcf32b3f0684c2433",
         "setting" : {
             "urlCheck" : false
         },
+        "optimization" : {
+            "subPackages" : true
+        },
         "usingComponents" : true,
         "permission" : {
             "scope.userLocation" : {
@@ -201,7 +204,7 @@
             "port" : 81,
             "proxy" : {
                 "/api" : {
-                    "target" : "http://api.shop.hzghd.com",
+                    "target" : "http://api.shop.wixhb.com",
                     "secure" : false,
                     "changeOrigin" : true,
                     "pathRewrite" : {

ghsApp/src/pagesPurchase/add.vue

@@ -6,7 +6,7 @@
 				<button class="admin-button-com middle blue" @click="selectFlowerNumFn()">选分类</button>
 			</view>
 			<view class="search-bar">
-				<app-search-module v-model="py" placeholder="拼音首字母搜索" @input="searchFn"/>
+				<app-search-module v-model="py" placeholder="输拼音首字母也可以搜" @input="searchFn"/>
 			</view>
 			<view style="padding:0 0upx 0 20upx;" >
 				<button class="admin-button-com middle blue" @click="pageTo({ url: '/admin/ptItem/itemList' })">添花材</button>
@@ -17,6 +17,11 @@
 		</view>
 
 		<view class="scroll-middle_bx">
+			<scroll-view scroll-y scroll-with-animation class="tab-view">
+				<div v-for="(item, index) in globalClassItemList" :key="index" class="tab-bar-item" :class="[classIndex == index ? 'active' : '']" :data-current="index" @tap.stop="swichClass(index)">
+					<text>{{ item.className || "" }}</text>
+				</div>
+			</scroll-view>
 			<scroll-view scroll-y class="right-box" :scroll-into-view="scroll_into_view" scroll-with-animation="true" @scroll="scroll_detail" lower-threshold="100" @scrolltolower="scroll_bottom">
 				<block v-if="!$util.isEmpty(globalClassItemList)">
 					<view class="item_list_bx selectAll" v-for="(classItem, classIndex) in globalClassItemList" :key="classIndex" :id="`class_${classIndex}`">

ghsApp/src/pagesPurchase/components/CommodityPurchase.vue

@@ -137,7 +137,7 @@ export default {
         display: inline-flex;
         & .iconfont {
           color: #4db0e4;
-          font-size: 72upx;
+          font-size: 55upx;
         }
         .icondelete {
           margin: 0 10upx 0 30upx;
@@ -148,9 +148,9 @@ export default {
         }
         & > .num {
           display: inline-block;
-					width: 140upx;
-					height:60upx;
-					line-height:60upx;
+					width: 120upx;
+					height:50upx;
+					line-height:50upx;
           text-align: center;
           margin: 0 8upx;
           color: #868686;

ghsApp/src/pagesPurchase/details.vue

@@ -27,7 +27,7 @@
 						</view>
 						<view class="summary-bar">
 							<view class="operate-view" @click="gobackEvent">
-								<text class="iconfont icongouwuche"></text>修改花材
+								<text class="iconfont icongouwuche"></text>返回修改
 							</view>
 							<view class="describe-view">
 								共{{ selectList.length }}种,合计 ¥{{ selectAllPrice }}
@@ -457,10 +457,10 @@ export default {
 				border-top: 1upx solid #eeeeee;
 				.operate-view {
 					display: flex;
-
 					align-items: center;
 					color: #3385ff;
-					font-size: 26upx;
+					font-size: 28upx;
+					font-weight:bold;
 					.iconfont {
 						margin-right: 20upx;
 						font-size: 40upx;

ghsApp/src/pagesStorehouse/allot/exSelect.vue

@@ -3,13 +3,19 @@
 	<view class="billing_box_bg">
 		<view class="input-wrap">
 			<view style="padding:0upx 0upx 0upx 0upx;margin-right:10upx;" >
-				<button class="admin-button-com middle blue" @click="selectFlowerNumFn()">选分类</button>
+				<button class="admin-button-com middle blue" @click="selectFlowerNumFn()">图片分类</button>
 			</view>
 			<view class="search-bar">
-				<app-search-module v-model="py" placeholder="输拼音首字母" @input="searchFn" />
+				<app-search-module v-model="py" placeholder="输拼音首字母也可以搜" @input="searchFn" />
 			</view>
 		</view>
 		<view class="scroll-middle_bx">
+			<scroll-view scroll-y scroll-with-animation class="tab-view">
+				<div v-for="(item, index) in globalClassItemList" :key="index" class="tab-bar-item" :class="[classIndex == index ? 'active' : '']" :data-current="index" @tap.stop="swichClass(index)">
+					<text>{{ item.className || "" }}</text>
+				</div>
+				<view style="height: 120upx"></view>
+			</scroll-view>
 				<scroll-view scroll-y class="right-box" v-if="tabIndex == 0" :scroll-into-view="scroll_into_view" scroll-with-animation="true"
 																	@scroll="scroll_detail"
 																	lower-threshold="100"

ghsApp/src/pagesStorehouse/inventory/select.vue

@@ -3,13 +3,19 @@
 	<view class="billing_box_bg">
 		<view class="input-wrap">
 			<view style="padding:0upx 0upx 0upx 0upx;margin-right:10upx;" >
-				<button class="admin-button-com middle blue" @click="selectFlowerNumFn()">选分类</button>
+				<button class="admin-button-com middle blue" @click="selectFlowerNumFn()">图片分类</button>
 			</view>
 			<view class="search-bar">
-				<app-search-module v-model="py" placeholder="输入拼音首字母也可以搜" @input="searchFn" />
+				<app-search-module v-model="py" placeholder="输拼音首字母也可以搜" @input="searchFn" />
 			</view>
 		</view>
 		<view class="scroll-middle_bx">
+			<scroll-view scroll-y scroll-with-animation class="tab-view" :scroll-top="scrollTop">
+				<div v-for="(item, index) in globalClassItemList" :key="index" class="tab-bar-item" :class="[classIndex == index ? 'active' : '']" :data-current="index" @tap.stop="swichClass(index)" >
+					<text>{{ item.className || "" }}</text>
+				</div>
+				<view style="height: 120upx"></view>
+			</scroll-view>
 				<scroll-view scroll-y class="right-box" v-if="tabIndex == 0" :scroll-into-view="scroll_into_view" scroll-with-animation="true"
 																	@scroll="scroll_detail"
 																	lower-threshold="100"

ghsApp/src/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.eot');
-  src: url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
-  url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
-  url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
-  url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
-  url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
+  src: url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.eot');
+  src: url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
+  url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
+  url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
+  url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
+  url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
 }
 
 .iconfont {