花惠宝更名为花掌柜

hdApp/src/admin/home/login.vue

@@ -6,7 +6,7 @@
 				<view style="text-align:center;margin-bottom:20upx;">
 				<image :src="`${constant.imgUrl}/logo4.png`" class="logo" mode="widthFix"></image> 
 				</view>
-				<view style="color:#666666;text-align:center;margin-bottom:50upx;font-size:35upx;">花惠宝</view>
+				<view style="color:#666666;text-align:center;margin-bottom:50upx;font-size:35upx;">花掌柜</view>
 				<view>
 				<input @focus="mobile=''" v-model="mobile" class="experInput" placeholder="手机号" type="number" />
 				</view>

hdApp/src/ext-production.json

@@ -6,6 +6,6 @@
     "account": 12358,
     "apiHost": "https://api.shop.huahb.cn",
     "imgHost": "https://img.huahb.cn",
-    "name":"花惠宝"
+    "name":"花掌柜"
   }
 }

hdApp/src/manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "花惠宝",
+    "name" : "花掌柜",
     "appid" : "__UNI__4079DC1",
     "description" : "花店管家婆",
     "versionName" : "1.0.6",
@@ -159,7 +159,7 @@
     },
     /* 快应用特有相关 */
     "quickapp" : {},
-    /* 小程序特有相关 线上（花惠宝） wx0d42f5f1dcb3a370 开发（花美玲） wxe4675bab299a52f7 */
+    /* 小程序特有相关 线上（花掌柜） wx0d42f5f1dcb3a370 开发（花美玲） wxe4675bab299a52f7 */
     "mp-weixin" : {
         "appid" : "wxe4675bab299a52f7",
         "setting" : {

hdApp/src/pages.json

@@ -94,7 +94,7 @@
 				{ "path": "member/add", "style": { "navigationBarTitleText": "添加客户" } },
 				{ "path": "member/detail", "style": { "navigationBarTitleText": "客户详情" } },
 				{ "path": "member/bind", "style": { "navigationBarTitleText": "绑定微信" } },
-				{ "path": "official/index", "style": { "navigationBarTitleText": "花惠宝" } },
+				{ "path": "official/index", "style": { "navigationBarTitleText": "花掌柜" } },
 				{ "path": "official/pay", "style": { "navigationBarTitleText": "支付" } },
 				{ "path": "official/renewal", "style": { "navigationBarTitleText": "续期" } },
 				{ "path": "official/apply", "style": { "navigationBarTitleText": "完善店铺信息" } },
@@ -388,7 +388,7 @@
 	],
 	"globalStyle": {
 		"navigationBarBackgroundColor": "#fff",
-		"navigationBarTitleText": "花惠宝",
+		"navigationBarTitleText": "花掌柜",
 		"navigationBarTextStyle": "black",
 		"backgroundColor": "#f9fbfc"
 	},

hdApp/src/pagesClient/member/detail.vue

@@ -143,7 +143,7 @@ export default {
   onShareAppMessage(res) {
 		if (res.target.id === "0") {
 			return  {
-          title: "更懂您的花惠宝",
+          title: "更懂您的花掌柜",
           desc: "",
           imgUrl: this.constant.imgUrl + "/retail/official/banner-1.png",
           path: "pagesClient/official/index?introMerchantId=" + this.userInfo.id

hdApp/src/pagesClient/official/callback.vue

@@ -53,7 +53,7 @@
                 <!-- <img :src="`${constant.imgUrl}/retail/common/qr-code.png`" alt /> -->
                 <img :src="officialApply.qrCode" alt />
               </div>
-              <div>识别二维码关注花惠宝</div>
+              <div>识别二维码关注花掌柜</div>
               <div>审核结果将通过微信通知您</div>
             </div>
           </block>

hdApp/src/pagesClient/official/index.vue

@@ -130,7 +130,7 @@ export default {
     console.log("pagesClient/official/index?ghsShopAdminId="+ghsShopAdminId+"&hdShopAdminId="+hdShopAdminId)
 
     return {
-      title: "更懂您的花惠宝",
+      title: "更懂您的花掌柜",
       desc: "",
       imgUrl: "",
       path: "pagesClient/official/index?ghsShopAdminId="+ghsShopAdminId+"&hdShopAdminId="+hdShopAdminId,

hdApp/src/pagesPurchase/particulars.vue

@@ -6,7 +6,7 @@
         <view :class="['iconfont', 'iconchenggong']"></view>
         <view class="result-title">支付成功</view>
         <view v-if="ghsCgScene!='' || fromCg == 1">
-        <view style="font-size:28upx;">微信下拉找到【花惠宝】小程序，如图点采购可以再次下单</view>
+        <view style="font-size:28upx;">微信下拉找到【花掌柜】小程序，如图点采购可以再次下单</view>
         <view style="margin-bottom:30upx;margin-top:15upx;">
           <image class="image" :src="`${constant.imgUrl}/cg/hd_cg_route.png`" mode="widthFix"></image>
         </view>

hdPad/src/manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "花惠宝",
+    "name" : "花掌柜",
     "appid" : "__UNI__4079DC1",
     "description" : "花店管家婆",
     "versionName" : "1.0.6",
@@ -132,7 +132,7 @@
     },
     /* 快应用特有相关 */
     "quickapp" : {},
-    /* 小程序特有相关 线上（花惠宝） wx0d42f5f1dcb3a370 开发（花美玲） wxe4675bab299a52f7 */
+    /* 小程序特有相关 线上（花掌柜） wx0d42f5f1dcb3a370 开发（花美玲） wxe4675bab299a52f7 */
     "mp-weixin" : {
         "appid" : "wxe4675bab299a52f7",
         "setting" : {

hdPad/src/mixins/product.js

@@ -35,9 +35,9 @@ export default {
 		allPrice() {
 			let price = 0;
 			if(!this.$util.isEmpty(this.selectList)){
-				if(this.currentJobType == 'makeWork'){
+				if(this.currentJobType == 'make'){
 
-				}else if(this.currentJobType == 'modifyWork'){
+				}else if(this.currentJobType == 'modify'){
 
 				}else{
 					for (const item of this.selectList) {
@@ -52,9 +52,9 @@ export default {
 			let bigNum = 0;
 			let smallNum = 0;
 			if(!this.$util.isEmpty(this.selectList)){
-				if(this.currentJobType == 'makeWork'){
+				if(this.currentJobType == 'make'){
 
-				}else if(this.currentJobType == 'modifyWork'){
+				}else if(this.currentJobType == 'modify'){
 
 				}else{
 					for (const item of this.selectList) {

hdPad/src/pages.json

@@ -4,7 +4,7 @@
 		{"path": "pages/home/work","style": {"navigationBarTitleText": "工单"}},
 		{"path": "pages/home/modify","style": {"navigationBarTitleText": "修改"}},
 		{"path": "pages/home/make","style": {"navigationBarTitleText": "制作"}},
-		{"path": "pages/home/selectMake","style": {"navigationBarTitleText": "选品制作"}}
+		{"path": "pages/home/selectMake","style": {"navigationBarTitleText": "选款制作"}}
 	],
 	"subPackages": [],
 	"globalStyle": {

hdPad/src/pages/home/components/nav.vue

@@ -7,7 +7,7 @@
 export default {
   data() {
     return {
-        nav:[{name:'收银',page:'/pages/home/cash'},{name:'工单',page:'/pages/home/work'},{name:'制作',page:'/pages/home/make'},{name:'选品制作',page:'/pages/home/selectMake'}]
+        nav:[{name:'收银',page:'/pages/home/cash'},{name:'工单',page:'/pages/home/work'},{name:'新款制作',page:'/pages/home/make'},{name:'选款制作',page:'/pages/home/selectMake'}]
     }
   },
   methods:{

hdPad/src/pages/home/components/rightGoodsArea.vue

@@ -26,7 +26,8 @@
 
         <!-- 选数量金额 -->
         <uni-popup ref="selectNumPriceRef" background-color="#fff" type="center" :animation="false">
-            <selectNumPrice @confirmAddItemModel="confirmAddItemModel" :customData.sync="customData" @cancelKdSelectNumPrice="addItemModelHidden"></selectNumPrice>
+            <selectNum v-if="currentJobType=='selectMake'" @confirmAddItemModel="confirmAddItemModel" :customData.sync="customData" @cancelKdSelectNumPrice="addItemModelHidden"></selectNum>
+            <selectNumPrice v-else @confirmAddItemModel="confirmAddItemModel" :customData.sync="customData" @cancelKdSelectNumPrice="addItemModelHidden"></selectNumPrice>
         </uni-popup>
 
     </view>
@@ -37,9 +38,10 @@ import { getGoodsList } from '@/api/goods/index'
 import productMins from "@/mixins/product";
 import list from "@/mixins/list";
 import selectNumPrice from './selectNumPrice.vue'
+import selectNum from './selectNum.vue'
 export default {
     name:'rightItemArea',
-    components:{ selectNumPrice },
+    components:{ selectNumPrice,selectNum },
 	mixins: [productMins,list],
     data(){
         return {

hdPad/src/pages/home/components/rightItemArea.vue

@@ -20,7 +20,8 @@
 
         <!-- 开单选花材输入数量和金额 -->
         <uni-popup ref="selectNumPriceRef" background-color="#fff" type="center" :animation="false">
-            <selectNumPrice @confirmAddItemModel="confirmAddItemModel" :customData.sync="customData" @cancelKdSelectNumPrice="addItemModelHidden"></selectNumPrice>
+            <selectNum v-if="currentJobType=='make'" @confirmAddItemModel="confirmAddItemModel" :customData.sync="customData" @cancelKdSelectNumPrice="addItemModelHidden"></selectNum>
+            <selectNumPrice v-else @confirmAddItemModel="confirmAddItemModel" :customData.sync="customData" @cancelKdSelectNumPrice="addItemModelHidden"></selectNumPrice>
         </uni-popup>
 
     </view>
@@ -30,9 +31,10 @@ import { showClass } from '@/api/item-class/index'
 import { showList } from '@/api/item/index'
 import productMins from "@/mixins/product";
 import selectNumPrice from './selectNumPrice.vue'
+import selectNum from './selectNum.vue'
 export default {
     name:'rightItemArea',
-    components:{ selectNumPrice },
+    components:{ selectNumPrice,selectNum },
 	mixins: [productMins],
     data(){
         return {

hdPad/src/pages/home/components/selectNum.vue

@@ -12,12 +12,6 @@
                         <text :class="{selected:checkType == 0}">{{buyNum}}</text>
                     </div>
                 </view>
-                <view @tap="checkCurrent(1)">
-                    <view class="desc">单价</view>
-                    <div class="flower-unit_box">
-                        <text :class="{selected:checkType == 1}">{{unitPrice}}</text>
-                    </div>
-                </view>
             </view>
 
             <view class="set-residue_box" v-if="customData.property && customData.property==1">
@@ -184,20 +178,20 @@ export default {
             text-align: center;
             color: #CCCCCC;
             font-size: 9upx;
-            margin-bottom:10upx;
             margin-top:6upx;
         }
         & .set-residue_box {
             font-size: 12upx;
             color: #CCCCCC;
             margin-top: 10upx;
-            text-align: left;
+            text-align: center;
         }
     }
     & .flower-open_box {
         display: flex;
+        margin-top:10upx;
         align-items: center;
-        justify-content: space-between;
+        justify-content: center;
         & > view {
             width:90upx;
             & .desc {
@@ -229,7 +223,7 @@ export default {
         height: 35upx;
         position: absolute;
         top:70upx;
-        left:14vw;
+        left:23vw;
         .change-unit {
             width: 35upx;
             height: 35upx;

hdPad/src/pages/home/components/selectNumPrice.vue

@@ -197,6 +197,7 @@ export default {
     & .flower-open_box {
         display: flex;
         align-items: center;
+        margin-top:10upx;
         justify-content: space-between;
         & > view {
             width:90upx;

hdPad/src/pages/home/login.vue

@@ -6,7 +6,7 @@
 					<view class="logo-area">
 						<image :src="`${constant.imgUrl}/logo4.png`" class="logo" mode="widthFix"></image> 
 					</view>
-					<view style="color:#666666;text-align:center;margin-bottom:10upx;font-size:20upx;">花惠宝</view>
+					<view style="color:#666666;text-align:center;margin-bottom:10upx;font-size:20upx;">花掌柜</view>
 					<view>
 						<input @focus="mobile=''" v-model="mobile" class="experInput" placeholder="手机号" type="number" />
 					</view>

hdPad/src/pages/home/make.vue

@@ -44,7 +44,7 @@ export default {
 			selectItemUser:{},
 			isLogin:2,
 			customId:0,
-            currentJobType:'makeWork',
+            currentJobType:'make',
             currentJobId:0,
 			chooseCustomer:false
 		}

hdPad/src/pages/home/modify.vue

@@ -37,7 +37,7 @@ export default {
 		return {
 			selectItem: {},
 			selectItemUser:{},
-            currentJobType:'modifyWork',
+            currentJobType:'modify',
             currentJobId:0,
 			orderItem:[]
 		}

开发/hdApp/src/manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "花惠宝",
+    "name" : "花掌柜",
     "appid" : "__UNI__4079DC1",
     "description" : "花店管家婆",
     "versionName" : "1.0.6",
@@ -159,7 +159,7 @@
     },
     /* 快应用特有相关 */
     "quickapp" : {},
-    /* 小程序特有相关 线上（花惠宝） wx0d42f5f1dcb3a370 开发（花美玲） wxe4675bab299a52f7 */
+    /* 小程序特有相关 线上（花掌柜） wx0d42f5f1dcb3a370 开发（花美玲） wxe4675bab299a52f7 */
     "mp-weixin" : {
         "appid" : "wxe4675bab299a52f7",
         "setting" : {

开发/hdPad/src/manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "花惠宝",
+    "name" : "花掌柜",
     "appid" : "__UNI__4079DC1",
     "description" : "花店管家婆",
     "versionName" : "1.0.6",
@@ -132,7 +132,7 @@
     },
     /* 快应用特有相关 */
     "quickapp" : {},
-    /* 小程序特有相关 线上（花惠宝） wx0d42f5f1dcb3a370 开发（花美玲） wxe4675bab299a52f7 */
+    /* 小程序特有相关 线上（花掌柜） wx0d42f5f1dcb3a370 开发（花美玲） wxe4675bab299a52f7 */
     "mp-weixin" : {
         "appid" : "wxe4675bab299a52f7",
         "setting" : {

线上/hdApp/src/ext.json

@@ -7,6 +7,6 @@
     "apiHost": "https://api.shop.huahb.cn",
     "socketApiHost": "api.shop.huahb.cn",
     "imgHost": "https://img.huahb.cn",
-    "name":"花惠宝"
+    "name":"花掌柜"
   }
 }

线上/hdApp/src/manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "花惠宝",
+    "name" : "花掌柜",
     "appid" : "__UNI__4079DC1",
     "description" : "花店管家婆",
     "versionName" : "1.0.6",
@@ -159,7 +159,7 @@
     },
     /* 快应用特有相关 */
     "quickapp" : {},
-    /* 小程序特有相关 线上（花惠宝） wx0d42f5f1dcb3a370 开发（花美玲） wxe4675bab299a52f7 */
+    /* 小程序特有相关 线上（花掌柜） wx0d42f5f1dcb3a370 开发（花美玲） wxe4675bab299a52f7 */
     "mp-weixin" : {
         "appid" : "wx0d42f5f1dcb3a370",
         "setting" : {

线上/hdPad/src/ext.json

@@ -7,6 +7,6 @@
     "apiHost": "https://api.shop.huahb.cn",
     "socketApiHost": "api.shop.huahb.cn",
     "imgHost": "https://img.huahb.cn",
-    "name":"花惠宝"
+    "name":"花掌柜"
   }
 }

线上/hdPad/src/manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "花惠宝",
+    "name" : "花掌柜",
     "appid" : "__UNI__4079DC1",
     "description" : "花店管家婆",
     "versionName" : "1.0.6",
@@ -132,7 +132,7 @@
     },
     /* 快应用特有相关 */
     "quickapp" : {},
-    /* 小程序特有相关 线上（花惠宝） wx0d42f5f1dcb3a370 开发（花美玲） wxe4675bab299a52f7 */
+    /* 小程序特有相关 线上（花掌柜） wx0d42f5f1dcb3a370 开发（花美玲） wxe4675bab299a52f7 */
     "mp-weixin" : {
         "appid" : "wx0d42f5f1dcb3a370",
         "setting" : {