恢复

hdApp/src/admin/billing/affirmGhs.vue

@@ -44,7 +44,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">共{{ allCountFun.bigLength }}扎,合计 ¥<text class="price">{{ allPriceFun }}</text></view>
 						</view>
@@ -620,10 +620,10 @@ export default {
 				border-top: 1px solid #eeeeee;
 				.operate-view {
 					display: flex;
-
 					align-items: center;
 					color: #3385ff;
-					font-size: 26upx;
+					font-size: 30upx;
+					font-weight:bold;
 					.iconfont {
 						margin-right: 20upx;
 						font-size: 40upx;

hdApp/src/config.js

@@ -1,4 +1,4 @@
 export const ProjectName = 'hd'
-export const APIHOST = 'https://api.shop.huaml.com'
-export const IMGHOST = 'https://img.huaml.com'
-export const CURRENT_ENV = 'dev'
+export const APIHOST = 'https://api.shop.huahb.cn'
+export const IMGHOST = 'https://img.huahb.cn'
+export const CURRENT_ENV = 'production'

hdApp/src/ext.json

@@ -1,12 +1,12 @@
 {
   "extEnable": true,
-  "extAppid": "wxe4675bab299a52f7",
+  "extAppid": "wx0d42f5f1dcb3a370",
   "directCommit": false,
   "ext": {
-    "account": 12362,
-    "apiHost": "https://api.shop.huaml.com",
-    "socketApiHost": "api.shop.huaml.com",
-    "imgHost": "https://img.huaml.com",
-    "name":"花美玲"
+    "account": 12358,
+    "apiHost": "https://api.shop.huahb.cn",
+    "socketApiHost": "api.shop.huahb.cn",
+    "imgHost": "https://img.huahb.cn",
+    "name":"花掌柜"
   }
 }

hdApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜",
     "appid" : "__UNI__4079DC1",
     "description" : "花店管家婆",
-    "versionName" : "1.1.4",
-    "versionCode" : 114,
+    "versionName" : "1.1.8",
+    "versionCode" : 118,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -93,7 +93,7 @@
                     "entitlements" : {
                         "com.apple.developer.associated-domains" : [ "applinks:fronttg.huahb.cn" ]
                     }
-                }           
+                }
             },
             /* SDK配置 */
             "sdkConfigs" : {
@@ -186,7 +186,7 @@
     "quickapp" : {},
     /* 小程序特有相关 线上（花掌柜） wx0d42f5f1dcb3a370 开发（花美玲） wxe4675bab299a52f7 */
     "mp-weixin" : {
-        "appid" : "wxe4675bab299a52f7",
+        "appid" : "wx0d42f5f1dcb3a370",
         "setting" : {
             "urlCheck" : false
         },

hdApp/src/pagesPurchase/components/item.vue

@@ -258,7 +258,7 @@ export default {
 				align-items: center;
 				& .iconfont {
 					color: #3385ff;
-					font-size: 72upx;
+					font-size: 55upx;
 				}
 				.position{
 					display: block;
@@ -274,15 +274,15 @@ export default {
 				}
 				& > .num {
 					display: inline-block;
-					width: 140upx;
-					height:60upx;
-					line-height:60upx;
+					width: 100upx;
+					height:40upx;
+					line-height:40upx;
 					text-align:center;
 					margin: 0 8upx;
 					color: #868686;
 					border-radius: 22upx;
 					background-color: #f5f5f5;
-					font-size: 33upx;
+					font-size: 24upx;
 				}
 				.change-input {
 					width: 164upx;

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -13,18 +13,32 @@
 
 		<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="padding:0 0upx 0 20upx;" >
-				<button class="admin-button-com middle blue" @click="delMemory()">清空花材</button>
+				<button class="admin-button-com middle blue" @click="delMemory()">清空</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 filterProductInfo" :key="index" class="tab-bar-item" :class="[classIndex == index ? 'active' : '']" :data-current="index" @tap.stop="swichClass(index)">
+					<!--<text>{{ item.className || "" }}</text>-->
+					<text v-if="item.classId=='-1'" style="color: red">{{ item.className || "" }}</text>
+					<text v-else>{{ item.className }}</text>
+					<text class="tag" v-if=" getSelectClassById(item.classId).bigCount > 0 || getSelectClassById(item.classId).smallCount > 0">
+						<text v-if=" getSelectClassById(item.classId).bigCount > 0 || getSelectClassById(item.classId).smallCount > 0 ">
+							{{ `${getSelectClassById(item.classId).bigCount}` }}
+						</text>
+						<text v-if="getSelectClassById(item.classId).smallCount > 0"> / </text>
+						<text v-if="getSelectClassById(item.classId).smallCount > 0">{{ getSelectClassById(item.classId).smallCount }}</text>
+					</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"

hdApp/src/static/iconfont/iconfont.css

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