开发环境

ghs/vue.config.js

@@ -2,14 +2,14 @@ const path = require('path');
 
 const isProduction = process.env.NODE_ENV === 'production';
 
-//http和https切换请修改这里，修改后需要重新运行npm run serve shish 2021.4.12
-const proxyTarget = 'https://api.shop.wixhb.com';
+//http和https切换请修改这里，同步修改下面图片的host，修改后需要重新运行npm run serve shish 2021.4.12
+const proxyTarget = 'https://api.shop.hzghd.com';
 
 function resolve(dir) {
 	return path.join(__dirname, dir);
 }
 
-let hostUrl = 'https://img.wixhb.com/';
+let hostUrl = 'https://img.hzghd.com/';
 
 const cdn = {
 	dev: {

ghsApp/src/api/purchase/index.js

@@ -8,6 +8,14 @@ export const modifyEntryTime = data => {
 	return https.get("/purchase-order/modify-entry-time", data);
 };
 
+/**
+ * 供货商采购详情：修改送货时间，写入 xhGhsCgOrder.sendTime。
+ * 对应 PurchaseOrderController::actionModifySendTime，只改日期、保留原时分秒。
+ */
+export const modifySendTime = data => {
+	return https.get("/purchase-order/modify-send-time", data);
+};
+
 export const batchConfirm = data => {
 	return https.post("/purchase/batch-confirm", data);
 };
@@ -61,15 +69,16 @@ export const getCgSalt = data => {
 };
 
 
-/** *
- * 采购列表
+/**
+ * 采购入库单列表。searchTime 筛账单时间 entryTime；sendSearchTime 筛发货时间 sendTime；可同时生效。
+ * 对应 PurchaseOrderController::actionList
  */
 export const getPurchaseListApi = async data => {
 	return https.get("/purchase-order/list", data);
 };
 
-/** *
- * 采购确认
+/**
+ * 供货商采购确认入库。sendTime 为送货时间（Y-m-d），空则后端按当天写入 xhGhsCgOrder.sendTime。
  */
 export const createPurchaseOrderApi = data => {
 	return https.post("/purchase-order/create-order", data);

ghsApp/src/config.js

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

ghsApp/src/manifest.json

@@ -221,7 +221,7 @@
     "quickapp" : {},
     /* 小程序特有相关 线上（销花宝） wxcf32b3f0684c2433 开发（花掌柜） wx21b7c3ef12082099 */
     "mp-weixin" : {
-        "appid" : "wxcf32b3f0684c2433",
+        "appid" : "wx21b7c3ef12082099",
         "setting" : {
             "urlCheck" : false,
             "minified" : true
@@ -235,7 +235,7 @@
         "optimization" : {
             "subPackages" : true
         },
-        "lazyCodeLoading" : "requiredComponents",
+        "lazyCodeLoading":"requiredComponents",
         "uniStatistics" : {
             "enable" : false
         },
@@ -279,7 +279,7 @@
             "port" : 81,
             "proxy" : {
                 "/api" : {
-                    "target" : "http://api.shop.wixhb.com",
+                    "target" : "http://api.shop.hzghd.com",
                     "secure" : false,
                     "changeOrigin" : true,
                     "pathRewrite" : {

ghsApp/src/pagesPurchase/details.vue

@@ -17,7 +17,6 @@
 										</text>
 									</view>
 
-
 									<view style="text-align:right;position: relative;">
 
 										<text style="position: absolute;right:300upx;top:6upx;font-size:30upx;color:#3385ff;font-weight:bold;">¥{{item.userPrice ? item.userPrice : 0}}</text>
@@ -37,9 +36,6 @@
 										</view>
 									</view>
 
-
-
-
 								</view>
 							</view>
 						</view>
@@ -180,12 +176,19 @@
 						</tui-list-cell>
 					</block>
 
+					<!-- 送货时间写入 sendTime，可选手动补录；空则后端按当天落库 -->
+					<tui-list-cell class="line-cell" :hover="false" :arrow="true">
+						<view class="tui-title">发货时间</view>
+						<view class="uni-input" v-if="form.sendTime == ''" style="color: #cccccc; width: 400upx; font-size: 32upx" @click="bindSendTimeChange">默认当天</view>
+						<view class="uni-input" @click="bindSendTimeChange" v-else style="width: 400upx; font-size: 32upx">{{ form.sendTime }}</view>
+					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false">
 						<view class="tui-title">备注</view>
 						<view class="tui-input">
 							<input type="text" v-model="form.remark" placeholder-class="phcolor" style="width:430upx;" class="tui-input" placeholder="这里写备注"/>
 						</view>
 					</tui-list-cell>
+
 				</view>
 
 			</form>
@@ -277,6 +280,7 @@ export default {
 				pickCharge: "",
 				localCharge: "",
 				entryTime: "",
+				sendTime: "",
 				yfPayWay:1,
 				remark:"",
 				avgKgWeight:'',
@@ -547,9 +551,14 @@ export default {
 		bindEntryTimeChange(){
 			this.showPicker = true
 		},
+		// 打开送货日期选择；允许选过去日期，确认后写入 form.sendTime
+		bindSendTimeChange(){
+			this.defaultPickerDate = this.form.sendTime || ''
+			this.showPicker = true
+		},
 		confirmPicker(e){
-			let date = e.value
-			this.form.entryTime = date
+			let date = String(e.value || '').replace(/\//g, '-')
+			this.form.sendTime = date
 			this.showPicker = false
 		},
 		isCostChange(e){

ghsApp/src/pagesPurchase/info.vue

@@ -18,7 +18,14 @@
 			</view>
 			<view class="bills-info_box content-box">
 				<view class="order-info_box">
-					<view>订单日期：</view>
+					<view>发货时间：</view>
+					<view>{{ detailInfo.sendTime && detailInfo.sendTime.indexOf('0000-00-00') < 0 ? detailInfo.sendTime.substr(2, 14) : '' }}</view>
+					<view class="price">
+						<button @click="openSendTimePicker" class="admin-button-com default">修改</button>
+					</view>
+				</view>
+				<view class="order-info_box">
+					<view>开单日期：</view>
 					<view>{{ detailInfo.addTime?detailInfo.addTime.substr(2,14):'' }}</view>
 				</view>
 				<view class="order-info_box">
@@ -351,7 +358,7 @@
 	</view>
 </template>
 <script>
-import { getPurchaseDetailApi,getCgDetail,updateRemark,printAll,confirmPutIn,cancelPutIn,printBill,assignSeat,checkSeatRemin,modifyEntryTime } from "@/api/purchase";
+import { getPurchaseDetailApi,getCgDetail,updateRemark,printAll,confirmPutIn,cancelPutIn,printBill,assignSeat,checkSeatRemin,modifyEntryTime,modifySendTime } from "@/api/purchase";
 import productMins from "@/mixins/product";
 import TuiListCell from "@/components/plugin/list-cell";
 import ModalModule from "@/components/plugin/modal"
@@ -413,6 +420,7 @@ export default {
 		return {
 			defaultPickerDate:'',
 			showPicker: false,
+			pickerType: '',
 			selectJobType: "order_change",
 			autoLoad: false,
 			stepActive: 0,
@@ -477,13 +485,31 @@ export default {
 	},	
 	methods: {
 		openPicker(){
+			this.pickerType = 'entryDate'
+			this.showPicker = true
+		},
+		// 打开发货日期选择；允许选过去，确认后写 xhGhsCgOrder.sendTime
+		openSendTimePicker(){
+			this.pickerType = 'sendDate'
+			this.defaultPickerDate = (this.detailInfo.sendTime && this.detailInfo.sendTime.indexOf('0000-00-00') < 0) ? this.detailInfo.sendTime.substr(0, 10) : ''
 			this.showPicker = true
 		},
 		confirmPicker(e) {
 			let that = this
-			let currentDate = e.value
+			const currentDate = String(e.value || '').replace(/\//g, '-')
+			this.showPicker = false
+			if (this.pickerType === 'sendDate') {
+				that.$util.confirmModal({content:'确认修改发货时间？'},() => {
+					modifySendTime({id:that.detailInfo.id,date:currentDate}).then(res=>{
+						if(res.code == 1){
+							that.$msg(res.msg)
+							that.initCgData()
+						}
+					})
+				})
+				return
+			}
 			that.$util.confirmModal({content:'确认修改？'},() => {
-				that.showPicker = false
 				modifyEntryTime({id:that.detailInfo.id,date:currentDate}).then(res=>{
 					if(res.code == 1){
 						that.$msg(res.msg)

ghsApp/src/pagesPurchase/order.vue

@@ -1,21 +1,49 @@
+<!--
+  供货商采购入库单列表。
+  顶栏：搜索 + 采购人；筛选条：发货时间、账单时间（入库日 entryTime）两套 DateSelect + 重置。
+  日历不嵌进列表滚动区，避免 App 端被订单卡片盖住。
+-->
 <template>
 	<view class="app-content">
 		<view class="order-page">
-			<view class="input-wrap_box">
-				<view>
-					<AppSearchModule placeholder="核销码 / 名称 / 手机号" @input="searchFn"/>
+			<view class="page-header">
+				<view class="search-row">
+					<view class="search-hold">
+						<AppSearchModule placeholder="核销码 / 名称 / 手机号" @input="searchFn"/>
+					</view>
+					<button
+						:class="['admin-button-com', 'middle', 'staff-btn', cgStaffId ? 'blue' : 'default']"
+						@click="showCgStaff"
+					>{{ cgStaffName == '' ? '采购人' : cgStaffName }}</button>
 				</view>
-				<view style="padding:0 0upx 0 20upx;" >
-					<button class="admin-button-com middle blue" @click="showCgStaff">{{ cgStaffName==''?'采购人':'已选择'}}</button>
+				<view class="filter-row">
+					<view class="date-chip">
+						<DateSelect
+							ref="sendDateSelect"
+							class="date-select"
+							top="0"
+							defaultShowName="发货时间"
+							@selectDateFn="selectSendDateFn"
+							@overlay-change="onSendDateOverlayChange"
+						/>
+					</view>
+					<view class="date-chip date-chip-gap">
+						<DateSelect
+							ref="billDateSelect"
+							class="date-select"
+							top="0"
+							defaultShowName="入库时间"
+							@selectDateFn="selectBillDateFn"
+							@overlay-change="onBillDateOverlayChange"
+						/>
+					</view>
+					<button class="admin-button-com default date-reset-btn" @click="resetDateFilters">重置</button>
 				</view>
 			</view>
-			<view class="tabs">
+			<view class="tabs-wrap">
 				<Tabs :isFixed="false" :tabs="tabs" :currentTab="tabIndex" @change="changeTabEvent" itemWidth="25%"></Tabs>
 			</view>
-			<view scroll-y class="order-list">
-			<view style="margin-left:50upx;padding-bottom:25upx;">
-				<DateSelect class="bar" top="0" @selectDateFn="selectDateFn" defaultShowName='时间' />
-			</view>
+			<view class="order-list" :class="{ 'is-covered': dateOverlayVisible }">
 				<block v-if="!$util.isEmpty(list.data)">
 					<OrderItem v-for="(item, index) in list.data" :key="index" :info="item" @click="gotoDetails(item)"></OrderItem>
 				</block>
@@ -23,8 +51,8 @@
 					<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
 				</block>
 			</view>
-			<view class="app-footer open_btn">
-				<view @click="addEvent" class="admin-button-com big blue">新增采购</view>
+			<view class="app-footer open_btn" :class="{ 'is-covered': dateOverlayVisible }">
+				<view @click="addEvent" class="admin-button-com big blue add-btn">新增采购</view>
 			</view>
 		</view>
 
@@ -43,6 +71,10 @@
 	</view>
 </template>
 <script>
+/**
+ * 采购入库列表页：按状态 Tab + 发货/账单时间筛选拉 /purchase-order/list。
+ * 账单时间对应 xhGhsCgOrder.entryTime（入库/记账日）；发货时间对应 sendTime。
+ */
 import Tabs from "@/components/plugin/tabs";
 import OrderItem from "./orderItem";
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
@@ -91,12 +123,22 @@ export default {
 				}
 			],
 			T:null,
-			searchContent:'',			
+			searchContent:'',
 			searchTime:'',
 			startTime:'',
 			endTime:'',
+			sendSearchTime:'',
+			sendStartTime:'',
+			sendEndTime:'',
 			cgStaffName:'',
-			cgStaffId:0
+			cgStaffId:0,
+			sendDateOverlayVisible: false,
+			billDateOverlayVisible: false
+		}
+	},
+	computed: {
+		dateOverlayVisible() {
+			return !!(this.sendDateOverlayVisible || this.billDateOverlayVisible)
 		}
 	},
 	onPullDownRefresh() {
@@ -175,21 +217,78 @@ export default {
 				that.resetList()
 				that.getCgList()
 			},700)
-		},		
-		selectDateFn(val) {
+		},
+		// 账单时间筛入库日 entryTime，可与发货时间同时生效
+		selectBillDateFn(val) {
 			this.searchTime = val.searchTime
 			this.startTime = val.startTime
 			this.endTime = val.endTime
 			this.resetList();
 			this.getCgList();
-		},		
+		},
+		// 发货时间筛 sendTime，可与账单时间同时生效
+		selectSendDateFn(val) {
+			this.sendSearchTime = val.searchTime
+			this.sendStartTime = val.startTime
+			this.sendEndTime = val.endTime
+			this.resetList();
+			this.getCgList();
+		},
+		onBillDateOverlayChange(visible) {
+			this.billDateOverlayVisible = !!visible
+			if (visible) {
+				this.closeDateSelect(this.$refs.sendDateSelect)
+			}
+		},
+		onSendDateOverlayChange(visible) {
+			this.sendDateOverlayVisible = !!visible
+			if (visible) {
+				this.closeDateSelect(this.$refs.billDateSelect)
+			}
+		},
+		// 两套日历互斥打开，避免弹层叠在一起
+		closeDateSelect(ref) {
+			if (ref && (ref.dropdownShow || ref.showPicker)) {
+				ref.dropdownShow = false
+				ref.showPicker = false
+			}
+		},
+		// 清空发货/账单两套时间筛选，列表回到未按时段过滤的状态
+		resetDateFilters() {
+			this.searchTime = ''
+			this.startTime = ''
+			this.endTime = ''
+			this.sendSearchTime = ''
+			this.sendStartTime = ''
+			this.sendEndTime = ''
+			if (this.$refs.billDateSelect && this.$refs.billDateSelect.reset) {
+				this.$refs.billDateSelect.reset()
+			}
+			if (this.$refs.sendDateSelect && this.$refs.sendDateSelect.reset) {
+				this.$refs.sendDateSelect.reset()
+			}
+			this.resetList()
+			this.getCgList()
+		},
 		init(){
 
 		},
 		getCgList() {
 			let ghsId = this.option.ghsId || 0
 			let status = this.tabs[this.tabIndex].key
-			let options = {page:this.list.page,status:status,ghsId:ghsId,search:this.searchContent,searchTime:this.searchTime,startTime:this.startTime,endTime:this.endTime,cgStaffId:this.cgStaffId}
+			let options = {
+				page: this.list.page,
+				status: status,
+				ghsId: ghsId,
+				search: this.searchContent,
+				searchTime: this.searchTime,
+				startTime: this.startTime,
+				endTime: this.endTime,
+				sendSearchTime: this.sendSearchTime,
+				sendStartTime: this.sendStartTime,
+				sendEndTime: this.sendEndTime,
+				cgStaffId: this.cgStaffId
+			}
 			return getPurchaseListApi(options) .then(res => {
 					this.completes(res);
 					this.tabs[this.tabIndex].value = res.data.totalNum?res.data.totalNum:0
@@ -218,98 +317,95 @@ export default {
 	height: 100%;
 	display: flex;
 	flex-direction: column;
-	background-color: #f9fbfc;
-	.input-wrap_box {
+	background-color: #f4f6f8;
+	.page-header {
+		flex-shrink: 0;
 		background-color: #fff;
-		height: 100upx;
+		box-shadow: 0upx 2upx 8upx 0upx rgba(0, 0, 0, 0.06);
+		position: relative;
+		z-index: 100;
+	}
+	.search-row {
 		display: flex;
 		align-items: center;
-		padding: 0 30upx;
-		& > view:nth-child(1) {
+		padding: 12upx 24upx 0;
+		.search-hold {
 			flex: 1;
+			min-width: 0;
 		}
-  	}
-	.order-list {
-		padding-top:20upx;
-		padding-bottom:100upx;
-		flex: 1;
-		.allot-item {
-			margin-bottom: 1upx;
-			padding: 30upx;
-			display: flex;
-			align-items: center;
-			box-shadow: 0upx 1upx 0upx 0upx #eeeeee;
-			background-color: #fff;
-			.info {
-				flex: 1;
-				margin-right: 20upx;
-				.info-order {
-					font-size: 32upx;
-					font-weight: 600;
-					color: #333333;
-				}
-				.info-name {
-					margin: 40upx 0 20upx;
-					font-size: 28upx;
-					font-weight: 400;
-					color: #666666;
-				}
-				.info-time {
-					margin-right: 30upx;
-					font-size: 28upx;
-					font-weight: 400;
-					color: #666666;
-				}
-			}
-			.status {
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				flex-shrink: 0;
-				width: 100upx;
-				color: #cccccc;
-				.status-name {
-					margin-top: 10upx;
-					font-size: 24upx;
-				}
-				.iconfont {
-					font-size: 46upx;
-				}
-				&.primary {
-					color: #3385ff;
-				}
-				&.gray {
-					color: #cccccc;
-				}
-				&.warn {
-					color: #ffaf1d;
-				}
-			}
+		.staff-btn {
+			flex-shrink: 0;
+			margin-left: 16upx;
+			max-width: 160upx;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
 		}
 	}
-	.bar-view {
-		flex-shrink: 0;
+	.filter-row {
 		display: flex;
-		justify-content: flex-end;
 		align-items: center;
-		padding: 0 30upx;
-		width: 100%;
-		height: 100upx;
-
-		box-shadow: 0upx -1upx 6upx 0upx rgba(4, 0, 0, 0.06);
-
-		.btn-view {
+		padding: 8upx 24upx 20upx;
+		.date-chip {
+			min-width: 180upx;
+			height: 64upx;
+			padding: 0 16upx;
+			border-radius: 8upx;
 			display: flex;
-			.admin-button-com {
-				margin: 0 10upx;
-				width: 140upx;
-			}
+			flex-direction: row;
+			align-items: center;
+			justify-content: center;
+			flex-shrink: 1;
+			box-sizing: border-box;
+			background: #f7f8fa;
+			border: 1upx solid #e8eaed;
 		}
+		.date-chip-gap {
+			margin-left: 16upx;
+		}
+		.date-select {
+			display: flex;
+			align-items: center;
+		}
+		.date-reset-btn {
+			flex-shrink: 0;
+			margin: 0 0 0 16upx;
+			height: 64upx;
+			line-height: 64upx;
+			padding: 0 24upx;
+			font-size: 26upx;
+			border-radius: 8upx;
+		}
+	}
+	.tabs-wrap {
+		flex-shrink: 0;
+		background-color: #fff;
+		margin-top: 16upx;
+		border-bottom: 1upx solid #f0f0f0;
 	}
-	.cg-set{
-		margin-right:60upx;
-		color:#3385ff;
-		font-size:30upx;
+	.order-list {
+		padding-top: 16upx;
+		padding-bottom: 140upx;
+		flex: 1;
+		&.is-covered {
+			/* #ifdef APP-PLUS */
+			visibility: hidden;
+			/* #endif */
+		}
+	}
+	.app-footer.open_btn {
+		justify-content: center;
+		padding-left: 30upx;
+		padding-right: 30upx;
+		&.is-covered {
+			/* #ifdef APP-PLUS */
+			visibility: hidden;
+			/* #endif */
+		}
+		.add-btn {
+			margin-right: 0;
+			width: 100%;
+		}
 	}
 }
 </style>

ghsApp/src/pagesPurchase/orderItem.vue

@@ -15,7 +15,7 @@
 		<view class="item-main" >
 			<view class="item-info">
 				<view class="info-row">
-					<text class="info-label"> 创建：</text>
+					<text class="info-label"> 开单：</text>
 					<text class="info-value">{{ info.addTime.substr(2,14) }} </text>
 				</view>
 				<view class="info-row">
@@ -46,6 +46,8 @@
 			</view>
 			<view class="item-price">¥{{ info.realPrice?parseFloat(info.realPrice):0 }} <text class="iconfont iconxiangyou"></text>
 			</view>
+			<!-- 发货时间贴卡片右缘；与入库时间（含时分秒）完全相同时不展示 -->
+			<text v-if="showSendTime" class="extra-date">发货时间 {{ info.sendTime.substr(2, 14) }}</text>
 		</view>
 	</view>
 </template>
@@ -61,6 +63,22 @@ export default {
 
 		};
 	},
+	computed: {
+		/**
+		 * 右侧发货时间：sendTime 有效，且与入库时间（含时分秒）不完全相同才展示。
+		 */
+		showSendTime() {
+			const send = this.info.sendTime
+			const entry = this.info.entryTime
+			if (!send || send.indexOf('0000-00-00') >= 0) {
+				return false
+			}
+			if (!entry || entry.indexOf('0000-00-00') >= 0) {
+				return true
+			}
+			return send.substr(0, 19) !== entry.substr(0, 19)
+		}
+	},
 	methods: {
 		clickItemEvent() {
 			this.$emit("click", this.info);
@@ -103,8 +121,8 @@ export default {
 	}
 	.item-main {
 		display: flex;
-
 		align-items: flex-end;
+		position: relative;
 		.item-info {
 			flex: 1;
 
@@ -123,6 +141,14 @@ export default {
 				color: #333333;
 			}
 		}
+		.extra-date {
+			position: absolute;
+			top: 12upx;
+			right: 0;
+			color: red;
+			font-size: 26upx;
+			white-space: nowrap;
+		}
 		.item-price {
 			display: flex;
 			align-items: center;

ghsPad/src/config.js

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

ghsPad/src/manifest.json

@@ -45,7 +45,7 @@
                     "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册，以便支持您修改头像、门店图片或花材图片",
                     "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限，以便支持您直接拍照上传头像、门店图片或花材图片"
                 },
-				"idfa" : false
+                "idfa" : false            
             },
             /* SDK配置 */
             "sdkConfigs" : {
@@ -133,13 +133,10 @@
     "quickapp" : {},
     /* 小程序特有相关 线上（销花宝） wxcf32b3f0684c2433 开发（花掌柜） wx21b7c3ef12082099 */
     "mp-weixin" : {
-        "appid" : "wxcf32b3f0684c2433",
+        "appid" : "wx21b7c3ef12082099",
         "setting" : {
             "urlCheck" : false
         },
-        "optimization" : {
-            "subPackages" : true
-        },
         "usingComponents" : true,
         "permission" : {
             "scope.userLocation" : {
@@ -174,7 +171,7 @@
             "port" : 81,
             "proxy" : {
                 "/api" : {
-                    "target" : "http://api.shop.wixhb.com",
+                    "target" : "http://api.shop.hzghd.com",
                     "secure" : false,
                     "changeOrigin" : true,
                     "pathRewrite" : {

hd/vue.config.js

@@ -3,13 +3,13 @@ const path = require('path');
 const isProduction = process.env.NODE_ENV === 'production';
 
 //http和https切换请修改这里，修改后需要重新运行npm run serve shish 2021.4.12
-const proxyTarget = 'https://api.shop.huahb.cn';
+const proxyTarget = 'https://api.shop.huaml.com';
 
 function resolve(dir) {
 	return path.join(__dirname, dir);
 }
 
-let hostUrl = 'https://img.huahb.cn/';
+let hostUrl = 'https://img.huaml.com/';
 
 const cdn = {
 	dev: {

hdApp/src/config.js

@@ -1,7 +1,7 @@
 export const ProjectName = 'hd'
-export const APIHOST = 'https://api.shop.huahb.cn'
-export const FORMALHOST = 'https://shop.huahb.cn'
-export const IMGHOST = 'https://img.huahb.cn'
-export const CURRENT_ENV = 'production'
-export const WSSHOST = 'wss://chat.shop.huahb.cn'
+export const APIHOST = 'https://api.shop.huaml.com'
+export const FORMALHOST = 'https://shop.huaml.com'
+export const IMGHOST = 'https://img.huaml.com'
+export const CURRENT_ENV = 'dev'
+export const WSSHOST = 'wss://chat.shop.huaml.com'
 export const APP_VERSION = '2.3.7'

hdApp/src/ext.json

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

hdApp/src/manifest.json

@@ -209,7 +209,7 @@
     "quickapp" : {},
     /* 小程序特有相关 线上（花掌柜） wx0d42f5f1dcb3a370 开发（花美玲） wxe4675bab299a52f7 */
     "mp-weixin" : {
-        "appid" : "wx0d42f5f1dcb3a370",
+        "appid" : "wxe4675bab299a52f7",
         "setting" : {
             "urlCheck" : false
         },
@@ -223,8 +223,8 @@
         "optimization" : {
             "subPackages" : true
         },
-        "lazyCodeLoading" : "requiredComponents",
-        "uniStatistics" : {
+        "lazyCodeLoading":"requiredComponents",
+       "uniStatistics" : {
             "enable" : false
         },
         "unipush" : {

hdApp/src/static/iconfont/iconfont.css

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

hdPad/src/config.js

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

hdPad/src/ext.json

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

hdPad/src/static/iconfont/iconfont.css

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

hdh5/config.js

@@ -1,3 +1,3 @@
 // API 配置
-export const APIHOST = 'https://api.shop.huahb.cn'
-export const IMGHOST = 'https://img.huahb.cn'
+export const APIHOST = 'https://api.shop.huaml.com'
+export const IMGHOST = 'https://img.huaml.com'

mallApp/src/config.js

@@ -1,4 +1,4 @@
 export const ProjectName = 'mall'
-export const CURRENT_ENV = 'production'
-export const APIHOST = 'https://api.shop.zhiguanhua.cn'
-export const WSSHOST = 'wss://chat.shop.huahb.cn'
+export const CURRENT_ENV = 'dev'
+export const APIHOST = 'https://api.shop.theflorist.cn'
+export const WSSHOST = 'wss://chat.shop.huaml.com'

mallApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "商城",
     "appid" : "__UNI__19572D0",
     "description" : "花店商城",
-    "versionName" : "1.0.10",
-    "versionCode" : "1010",
+    "versionName" : "1.0.12",
+    "versionCode" : "1012",
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -38,14 +38,12 @@
                     "NSPhotoLibraryUsageDescription" : "该应用需要读取您的相册，以便支持您修改头像、门店图片或花材图片",
                     "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册，以便支持您修改头像、门店图片或花材图片",
                     "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限，以便支持您直接拍照上传头像、门店图片或花材图片"
-				},
-				"idfa" : false
+                },
+                "idfa" : false            
             },
             /* SDK配置 */
             "sdkConfigs" : {
-                "speech" : {
-                    
-                }
+                "speech" : {}
             },
             "orientation" : [ "portrait-primary" ]
         },
@@ -57,13 +55,17 @@
     "quickapp" : {},
     /* 小程序特有相关 线上（花卉宝） wx99a1dfc4171efb42 开发（中花卉） wxe41bd5816affd0ba */
     "mp-weixin" : {
-        "appid" : "wx99a1dfc4171efb42",
+        "appid" : "wxe41bd5816affd0ba",
         "setting" : {
             "urlCheck" : false
         },
+        "optimization" : {
+            "subPackages" : true
+        },
         "usingComponents" : true,
-        "permission" : {},
-        "lazyCodeLoading" : "requiredComponents",
+        "permission" : {
+        },
+        "lazyCodeLoading":"requiredComponents",
         "uniStatistics" : {
             "enable" : false
         }
@@ -93,7 +95,7 @@
             "base" : "/"
         },
         "async": {
-            "timeout": 20000
+            "timeout": 200000
         },
         "optimization": {
             "treeShaking": {
@@ -123,8 +125,7 @@
         "uniStatistics" : {
             "enable" : false
         }
-    }
-    ,
+    },
     "uniStatistics" : {
         "version" : "2",
         "enable" : false

mallApp/src/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
- src: url('https://api.shop.zhiguanhua.cn/iconfont/iconfont.eot?t=202608271143'); /* IE9 */
- src: url('https://api.shop.zhiguanhua.cn/iconfont/iconfont.eot?t=202608271143#iefix') format('embedded-opentype'), /* IE6-IE8 */
-	  url('https://api.shop.zhiguanhua.cn/iconfont/iconfont.woff2?t=202608271143') format('woff2'),
-	  url('https://api.shop.zhiguanhua.cn/iconfont/iconfont.woff?t=202608271143') format('woff'),
-	  url('https://api.shop.zhiguanhua.cn/iconfont/iconfont.ttf?t=202608271143') format('truetype'),
-	  url('https://api.shop.zhiguanhua.cn/iconfont/iconfont.svg?t=202608271143#iconfont') format('svg');
+ src: url('https://api.shop.theflorist.cn/iconfont/iconfont.eot?t=202608271143'); /* IE9 */
+ src: url('https://api.shop.theflorist.cn/iconfont/iconfont.eot?t=202608271143#iefix') format('embedded-opentype'), /* IE6-IE8 */
+	  url('https://api.shop.theflorist.cn/iconfont/iconfont.woff2?t=202608271143') format('woff2'),
+	  url('https://api.shop.theflorist.cn/iconfont/iconfont.woff?t=202608271143') format('woff'),
+	  url('https://api.shop.theflorist.cn/iconfont/iconfont.ttf?t=202608271143') format('truetype'),
+	  url('https://api.shop.theflorist.cn/iconfont/iconfont.svg?t=202608271143#iconfont') format('svg');
 }
 
 .iconfont {

pt/vue.config.js

@@ -3,13 +3,13 @@ const path = require('path');
 const isProduction = process.env.NODE_ENV === 'production';
 
 //http和https切换请修改这里，修改后需要重新运行 npm run serve 即可 shish 2021.4.12
-const proxyTarget = 'https://api.pt.wixhb.com';
+const proxyTarget = 'https://api.pt.huaml.com';
 
 function resolve(dir) {
 	return path.join(__dirname, dir);
 }
 
-let hostUrl = 'https://img.wixhb.com/';
+let hostUrl = 'http://img.hzghd.com/';
 
 const cdn = {
 	dev: {