更新b端

mobile-code/src/admin/order/components/sel-confirm.vue

@@ -47,7 +47,7 @@
 								</div>
 							</block>
 							<block v-else>
-								<div>配送方：自己送</div>
+								<div>配送方：门店</div>
 							</block>
 						</div>
 					</div>
@@ -60,10 +60,13 @@
 						<div class="axis-title">{{ orderComData[3].actionName }}</div>
 						<div class="axis-det">
 							<div class="app-bold">{{ orderComData[3].addTime | formatTime }}</div>
-							<card-name :info="orderComData[3].receive" />
+							<card-name v-if="!$util.isEmpty(orderComData[3].receive)" :info="orderComData[3].receive" />
+							<block v-else>
+								<div>无配送信息</div>
+							</block>
 							<div class="btn-wrap-com">
 								<!-- <button class="admin-button-com default">明细</button> -->
-								<button class="admin-button-com default">重打</button>
+								<!-- <button class="admin-button-com default">重打</button> -->
 							</div>
 						</div>
 					</div>

mobile-code/src/admin/order/components/sel-express-confirm.vue

@@ -13,7 +13,7 @@
 					<div class="axis-slot-wrap">
 						<div class="axis-title">送达</div>
 						<div class="axis-det express-wrap">
-							<button class="admin-button-com big blue" @click="confirmFn">确认已送达</button>
+							<button class="admin-button-com big blue" @click="confirmFn">确认送达</button>
 							<div class="button-prompt">送达会自动通知客户哦</div>
 						</div>
 					</div>
@@ -37,7 +37,7 @@
 								</div>
 							</block>
 							<block v-else>
-								<div>配送方：自己送</div>
+								<div>配送方：门店</div>
 							</block>
 						</div>
 					</div>
@@ -49,14 +49,19 @@
 					<div class="axis-slot-wrap">
 						<div class="axis-title">{{ orderComData[2].actionName }}</div>
 						<div class="axis-det">
-							<div class="app-bold">{{ orderComData[2].addTime | formatTime }}</div>
+							<div class="app-bold">{{ orderComData[2].finishTime | formatTime }}</div>
 							<block v-if="!$util.isEmpty(orderComData[2].receive)">
 								<card-name :info="orderComData[2].receive" />
 							</block>
-							<div class="btn-wrap-com">
-								<!-- <button class="admin-button-com default">明细</button> -->
-								<button class="admin-button-com default">重打</button>
-							</div>
+							<block v-else>
+								<div>无配送信息</div>
+							</block>
+							<block v-if="!$util.isEmpty(orderComData[2].receive)">
+								<div class="btn-wrap-com">
+									<!-- <button class="admin-button-com default">明细</button> -->
+									<button class="admin-button-com default">重打</button>
+								</div>
+							</block>
 						</div>
 					</div>
 				</template>
@@ -67,7 +72,7 @@
 					<div class="axis-slot-wrap">
 						<div class="axis-title">{{ orderComData[3].actionName }}</div>
 						<div class="axis-det">
-							<div class="app-color-0 app-bold">{{ orderComData[3].addTime | formatTime }}</div>
+							<div class="app-color-0 app-bold">{{ orderComData[3].finishTime | formatTime }}</div>
 						</div>
 					</div>
 				</template>

mobile-code/src/admin/order/components/sel-ship-confirm.vue

@@ -14,15 +14,15 @@
 						<div class="axis-title">{{ orderComData[0].actionName }}</div>
 						<div class="axis-det">
 							<div class="app-color-0 app-bold">{{ orderComData[0].finishTime | formatTime }}</div>
-							<div>订单归类: {{ orderComData[0].classify.category }}</div>
-							<div>用途：{{ orderComData[0].classify.usage }}</div>
+							<!-- <div>订单归类: {{ orderComData[0].classify.category }}</div> -->
+							<!-- <div>用途：{{ orderComData[0].classify.usage }}</div> -->
 							<!-- <div>消息推送：已推送</div> -->
 						</div>
 					</div>
 				</template>
 			</timeaxis-item>
 			<!-- 送达 -->
-			<timeaxis-item class="axis-list com-wrap" bgcolor="none">
+			<!-- <timeaxis-item class="axis-list com-wrap" bgcolor="none">
 				<template v-slot:content>
 					<div class="axis-slot-wrap">
 						<div class="axis-title">{{ orderComData[1].actionName }}</div>
@@ -31,15 +31,15 @@
 						</div>
 					</div>
 				</template>
-			</timeaxis-item>
+			</timeaxis-item> -->
 			<!-- 发货 -->
 			<timeaxis-item class="axis-list confirm-wrap" bgcolor="none">
 				<template v-slot:content>
 					<div class="axis-slot-wrap">
-						<div class="axis-title">{{ orderComData[2].actionName}}</div>
+						<div class="axis-title">{{ orderComData[1].actionName}}</div>
 						<div class="axis-det">
-							<div class="app-color-0 app-bold">{{ orderComData[2].addTime | formatTime }}</div>
-							<block v-if="!$util.isEmpty(orderComData[2].sendInfo)">
+							<div class="app-color-0 app-bold">{{ orderComData[1].addTime | formatTime }}</div>
+							<block v-if="!$util.isEmpty(orderComData[1].sendInfo)">
 								<div>配送方：{{ orderComData[2].sendInfo.sendSideName }}</div>
 								<div>距离：{{ orderComData[2].sendInfo.sendDistance }}km</div>
 								<div>运费：¥{{ orderComData[2].sendInfo.sendCost }}</div>
@@ -47,7 +47,7 @@
 								<div>状态：{{ orderComData[2].sendInfo.sendStatus | constantfilter('SEND_STATUS') }}</div>
 							</block>
 							<block v-else>
-								<div>配送方：自己送</div>
+								<div>配送方：门店</div>
 							</block>
 						</div>
 					</div>
@@ -57,13 +57,16 @@
 			<timeaxis-item class="axis-list com-wrap" bgcolor="none">
 				<template v-slot:content>
 					<div class="axis-slot-wrap">
-						<div class="axis-title">{{ orderComData[3].actionName}}</div>
+						<div class="axis-title">{{ orderComData[2].actionName}}</div>
 						<div class="axis-det">
-							<div class="app-bold">{{ orderComData[3].addTime | formatTime }}</div>
-							<card-name v-if="!$util.isEmpty(orderComData[3].receive)" :info="orderComData[3].receive" />
+							<div class="app-bold">{{ orderComData[2].addTime | formatTime }}</div>
+							<card-name v-if="!$util.isEmpty(orderComData[2].receive)" :info="orderComData[2].receive" />
+							<block v-else>
+								<div>无配送信息</div>
+							</block>
 							<div class="btn-wrap-com">
 								<!-- <button class="admin-button-com default">明细</button> -->
-								<button class="admin-button-com default" @click="() => { alert('打印功能待开发！') }">打印</button>
+								<!-- <button class="admin-button-com default" @click="() => { alert('打印功能待开发！') }">打印</button> -->
 							</div>
 						</div>
 					</div>
@@ -73,9 +76,9 @@
 			<timeaxis-item class="axis-list com-wrap" bgcolor="none">
 				<template v-slot:content>
 					<div class="axis-slot-wrap">
-						<div class="axis-title">{{ orderComData[4].actionName}}</div>
+						<div class="axis-title">{{ orderComData[3].actionName}}</div>
 						<div class="axis-det">
-							<div class="app-bold">{{ orderComData[4].addTime | formatTime }}</div>
+							<div class="app-bold">{{ orderComData[3].addTime | formatTime }}</div>
 						</div>
 					</div>
 				</template>

mobile-code/src/admin/order/components/sel-ship-manage.vue

@@ -12,8 +12,9 @@
 				<template v-slot:content>
 					<div class="axis-slot-wrap">
 						<div class="axis-title">发货</div>
-						<div class="axis-det">
-							<button class="admin-button-com big blue confirm-btn" @click="sendShipFn">确认发货</button>
+						<div class="axis-det btn-wrap">
+							<button class="admin-button-com big blue confirm-btn" @click="sendSelfFn">自己送</button>
+							<button class="admin-button-com big blue confirm-btn" @click="sendShipFn">代送</button>
 						</div>
 					</div>
 				</template>
@@ -50,13 +51,13 @@
 		<modal-module :show="shipModal" :maskClosable="false" @cancel="modalCancel" @click="shipModalClick" title="确认发货？" padding="30rpx 30rpx">
 			<template v-slot:content>
 				<div class="app-modal-input-wrap ship-modal">
-					<div class="inp-list-line switch-wrap">
+					<!-- <div class="inp-list-line switch-wrap">
 						<div class="line-label">快递代送</div>
 						<div class="line-input flex-strat">
 							<switch :checked="form.sendType == '0' ? false : true" @change="switchChangeFn" />
 						</div>
-					</div>
-					<block v-if="form.sendType == 1">
+					</div> -->
+					<!-- <block v-if="form.sendType == 1"> -->
 						<div class="inp-list-line">
 							<div class="line-label">送花时间</div>
 							<div class="line-input">
@@ -75,10 +76,12 @@
 								</picker>
 							</div>
 						</div>
-					</block>
+					<!-- </block> -->
 				</div>
 			</template>
 		</modal-module>
+		<!-- 删除提示 -->
+		<modal-module :show="selfShipModal" @cancel="modalCancel" @click="shipModalClick" content="确认已送达？" color="#333" :size="32" padding="30rpx 30rpx"></modal-module>
 	</div>
 </template>
 
@@ -132,7 +135,9 @@ export default {
 					text: '达达配送',
 					key: 1
 				}
-			]
+			],
+			// 自己送
+			selfShipModal: false
 		}
 	},
 	methods: {
@@ -144,6 +149,14 @@ export default {
 				sendSide: ''
 			}
 		},
+		sendSelfFn() {
+			this.selfShipModal = true
+			this.form = {
+				sendType: 2,
+				sendTime: '',
+				sendSide: 1
+			}
+		},
 		printOrderFn() {
 			printOrder({
 				id: this.orderData.id,
@@ -193,6 +206,7 @@ export default {
 		},
 		modalCancel() {
 			this.shipModal = false
+			this.selfShipModal = false
 		}
 	}
 }
@@ -205,7 +219,7 @@ export default {
 			margin-top: 40px !important;
 		}
 		.confirm-btn {
-			width: 100%;
+			width: 40%;
 		}
 	}
 	// 打单
@@ -226,4 +240,9 @@ export default {
 			width: 140px;
 		}
 	}
+	.btn-wrap {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
 </style>

mobile-code/src/admin/order/ship.vue

@@ -130,28 +130,29 @@ export default {
 		},
 		getPageStatus() {
 			uni.hideLoading()
-			this.showIndex = 7
-			// if (this.$util.isEmpty(this.orderComData)) return false
-			// let textStatus = this.orderComData[0].actionName
-			// if (textStatus == '打单') {
-			// 	let receive = this.orderComData[0].receive
-			// 	if (this.$util.isEmpty(receive)) {
-			// 		this.showIndex = 0
-			// 	} else {
-			// 		this.showIndex = 1
-			// 	}
-			// } else if (textStatus == '发货') {
-			// 	this.showIndex = 7
-			// } else if (textStatus == '送达') {
-			// 	this.showIndex = 4
-			// } else if (textStatus == '完成') {
-			// 	let classify = this.orderComData[0].classify
-			// 	if (this.$util.isEmpty(classify)) {
-			// 		this.showIndex = 5
-			// 	} else {
-			// 		this.showIndex = 6
-			// 	}
-			// }
+			if (this.$util.isEmpty(this.orderComData)) return false
+			let actionSign = this.orderComData[0].actionSign
+			if (actionSign == 'printOrder') {
+				let receive = this.orderComData[0].receive
+				if (this.$util.isEmpty(receive)) {
+					this.showIndex = 0
+				} else {
+					this.showIndex = 1
+				}
+			} else if (actionSign == 'deliver') {
+				this.showIndex = 7
+			} else if (actionSign == 'reach') {
+				if (this.orderComData[0].finishTime == 0) {
+					this.showIndex = 4
+				} else {
+					// let classify = this.orderComData[0].classify
+					// if (this.$util.isEmpty(classify)) {
+					// 	this.showIndex = 5
+					// } else {
+					this.showIndex = 6
+					// }
+				}
+			}
 		}
 	}
 }

mobile-code/src/b-config.js

@@ -1,2 +0,0 @@
-// 项目配置--由bat脚本变更
-export const ProjectName = 'business'

mobile-code/src/b-pages.json

@@ -1,335 +0,0 @@
-{
-	"pages": [
-		{
-			"path": "admin/home/workbench",
-			"style": {
-				"navigationBarTitleText": "工作台"
-			}
-		},
-		{
-			"path": "admin/home/order",
-			"style": {
-				"navigationBarTitleText": "订单"
-			}
-		},
-		{
-			"path": "admin/home/member",
-			"style": {
-				"navigationBarTitleText": "客户"
-			}
-		},
-		{
-			"path": "common/redirect",
-			"style": {
-				"navigationBarTitleText": "加载中..."
-			}
-		},
-		{
-			"path": "common/webview",
-			"style": {
-				"navigationBarBackgroundColor": "#ffffff",
-				"navigationBarTextStyle": "black"
-			}
-		}
-	],
-	"subPackages": [
-		{
-			"root": "admin/order",
-			"pages": [
-				{
-					"path": "detail",
-					"style": {
-						"navigationBarTitleText": "详情"
-					}
-				},
-				{
-					"path": "ship",
-					"style": {
-						"navigationBarTitleText": "发货"
-					}
-				},
-				{
-					"path": "fill-form",
-					"style": {
-						"navigationBarTitleText": "填写收花人"
-					}
-				}
-			]
-		},
-		{
-			"root": "admin/member",
-			"pages": [
-				{
-					"path": "add",
-					"style": {
-						"navigationBarTitleText": "添加客户"
-					}
-				},
-				{
-					"path": "detail",
-					"style": {
-						"navigationBarTitleText": "客户详情"
-					}
-				}
-			]
-		},
-		{
-			"root": "admin/interest",
-			"pages": [
-				{
-					"path": "invite",
-					"style": {
-						"navigationBarTitleText": "邀请列表"
-					}
-				},
-				{
-					"path": "my-invite",
-					"style": {
-						"navigationBarTitleText": "我的邀请"
-					}
-				},
-				{
-					"path": "setting",
-					"style": {
-						"navigationBarTitleText": "奖励设置"
-					}
-				}
-			]
-		},
-		{
-			"root": "admin/coupon",
-			"pages": [
-				{
-					"path": "list",
-					"style": {
-						"navigationBarTitleText": "优惠券"
-					}
-				}
-			]
-		},
-		{
-			"root": "admin/ad",
-			"pages": [
-				{
-					"path": "list",
-					"style": {
-						"navigationBarTitleText": "广告列表"
-					}
-				},
-				{
-					"path": "add",
-					"style": {
-						"navigationBarTitleText": "添加广告"
-					}
-				},
-				{
-					"path": "sel-goods",
-					"style": {
-						"navigationBarTitleText": "商品选择"
-					}
-				}
-			]
-		},
-		{
-			"root": "admin/staff",
-			"pages": [
-				{
-					"path": "list",
-					"style": {
-						"navigationBarTitleText": "员工管理"
-					}
-				},
-				{
-					"path": "add",
-					"style": {
-						"navigationBarTitleText": ""
-					}
-				},
-				{
-					"path": "sel-member",
-					"style": {
-						"navigationBarTitleText": "客户列表"
-					}
-				}
-			]
-		},
-		{
-			"root": "admin/shop",
-			"pages": [
-				{
-					"path": "list",
-					"style": {
-						"navigationBarTitleText": "店铺管理"
-					}
-				},
-				{
-					"path": "add",
-					"style": {
-						"navigationBarTitleText": ""
-					}
-				}
-			]
-		},
-		{
-			"root": "admin/setting",
-			"pages": [
-				{
-					"path": "list",
-					"style": {
-						"navigationBarTitleText": "设置"
-					}
-				},
-				{
-					"path": "wx-menu",
-					"style": {
-						"navigationBarTitleText": "微信菜单设置"
-					}
-				},
-				{
-					"path": "coupon",
-					"style": {
-						"navigationBarTitleText": "新人领券设置"
-					}
-				},
-				{
-					"path": "level",
-					"style": {
-						"navigationBarTitleText": "会员等级设置"
-					}
-				},
-				{
-					"path": "password",
-					"style": {
-						"navigationBarTitleText": "密码设置"
-					}
-				}
-			]
-		},
-		{
-			"root": "admin/goodsManage",
-			"pages": [
-				{
-					"path": "list",
-					"style": {
-						"navigationBarTitleText": "商品管理"
-					}
-				},
-				{
-					"path": "category",
-					"style": {
-						"navigationBarTitleText": "分类管理"
-					}
-				},
-				{
-					"path": "add",
-					"style": {
-						"navigationBarTitleText": "添加商品"
-					}
-				},
-				{
-					"path": "img-store",
-					"style": {
-						"navigationBarTitleText": "图库管理"
-					}
-				},
-				{
-					"path": "goods-name",
-					"style": {
-						"navigationBarTitleText": "填写商品信息"
-					}
-				},
-				{
-					"path": "freight",
-					"style": {
-						"navigationBarTitleText": "运费设置"
-					}
-				},
-				{
-					"path": "price-increase",
-					"style": {
-						"navigationBarTitleText": "节假日自动涨价"
-					}
-				}
-			]
-		},
-		{
-			"root": "admin/statistics",
-			"pages": [
-				{
-					"path": "index",
-					"style": {
-						"navigationBarTitleText": "数据统计"
-					}
-				}
-			]
-		},
-		{
-			"root": "admin/assets",
-			"pages": [
-				{
-					"path": "list",
-					"style": {
-						"navigationBarTitleText": "收入明细"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/chat",
-			"pages": [
-				{
-					"path": "index",
-					"style": {
-						"navigationBarTitleText": "客服",
-						"enablePullDownRefresh": true
-					}
-				}
-			]
-		},
-		{
-			"root": "admin/template",
-			"pages": [
-				{
-					"path": "index",
-					"style": {
-						"navigationBarTitleText": "选择模板"
-					}
-				}
-			]
-		}
-	],
-	"globalStyle": {
-		// #ifdef H5
-		"navigationStyle": "custom",
-		// #endif
-		"navigationBarBackgroundColor": "#fff",
-		"navigationBarTitleText": "花卉宝",
-		"navigationBarTextStyle": "black"
-	},
-	"tabBar": {
-		"color": "#C0C4CC",
-		"selectedColor": "#3385FF",
-		"borderStyle": "black",
-		"backgroundColor": "#ffffff",
-		"list": [{
-				"pagePath": "admin/home/workbench",
-				"iconPath": "static/images/admin/workbench-no.png",
-				"selectedIconPath": "static/images/admin/workbench-is.png",
-				"text": "工作台"
-			},
-			{
-				"pagePath": "admin/home/order",
-				"iconPath": "static/images/admin/order-no.png",
-				"selectedIconPath": "static/images/admin/order-is.png",
-				"text": "订单"
-			},
-			{
-				"pagePath": "admin/home/member",
-				"iconPath": "static/images/admin/member-no.png",
-				"selectedIconPath": "static/images/admin/member-is.png",
-				"text": "客户"
-			}
-		]
-	}
-}
-

mobile-code/src/config.js

@@ -1,2 +1,2 @@
-// 项目配置--由bat脚本自动变更
-export const ProjectName = 'mobile'
+// 项目配置--由bat脚本变更
+export const ProjectName = 'business'

mobile-code/src/m-config.js

@@ -0,0 +1,2 @@
+// 项目配置--由bat脚本自动变更
+export const ProjectName = 'mobile'

mobile-code/src/b-manifest.json → mobile-code/src/m-manifest.json

@@ -90,7 +90,7 @@
         "usingComponents" : true,
         "permission" : {
             "scope.userLocation" : {
-                "desc" : "请点击确定"
+                "desc" : "获取位置信息后为您提供个性化推荐"
             }
         }
     },
@@ -121,7 +121,7 @@
             "port": 81,
             "proxy": {
                 "/api": {
-                    "target": "http://api.b.huaml.com",
+                    "target": "http://api.m.huaml.com",
                     "secure": false,
                     "changeOrigin": true,
                     "pathRewrite": {

mobile-code/src/m-pages.json

@@ -0,0 +1,203 @@
+{
+	"pages": [
+		{
+			"path": "pages/home/index",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/home/category",
+			"style": {
+				"navigationBarTitleText": "分类"
+			}
+		},
+		{
+			"path": "pages/home/shop",
+			"style": {
+				"navigationBarTitleText": "门店"
+			}
+		},
+		{
+			"path": "pages/home/user",
+			"style": {
+				"navigationBarTitleText": "我的"
+			}
+		},
+		{
+			"path": "common/redirect",
+			"style": {
+				"navigationBarTitleText": "加载中..."
+			}
+		},
+		{
+			"path": "common/webview",
+			"style": {
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		}
+	],
+	"subPackages": [
+		{
+			"root": "pages/user",
+			"pages": [
+				{
+					"path": "register",
+					"style": {
+						"navigationBarTitleText": "注册"
+					}
+				},
+				{
+					"path": "password",
+					"style": {
+						"navigationBarTitleText": "修改密码"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/goods",
+			"pages": [
+				{
+					"path": "detail",
+					"style": {
+						"navigationBarTitleText": "详情"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/pay",
+			"pages": [
+				{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/callback",
+			"pages": [
+				{
+					"path": "index"
+				}
+			]
+		},
+		{
+			"root": "pages/coupon",
+			"pages": [
+				{
+					"path": "list",
+					"style": {
+						"navigationBarTitleText": "优惠券",
+						"enablePullDownRefresh": true
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/order",
+			"pages": [
+				{
+					"path": "list",
+					"style": {
+						"navigationBarTitleText": "订单列表",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "detail",
+					"style": {
+						"navigationBarTitleText": "订单列表"
+					}
+				},
+				{
+					"path": "buy",
+					"style": {
+						"navigationBarTitleText": "订单确认"
+					}
+				},
+				{
+					"path": "comment",
+					"style": {
+						"navigationBarTitleText": "评价"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/interest",
+			"pages": [
+				{
+					"path": "invite",
+					"style": {
+						"navigationBarTitleText": "邀请排行",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "level",
+					"style": {
+						"navigationBarTitleText": "会员等级",
+						"enablePullDownRefresh": true
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/chat",
+			"pages": [
+				{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "客服",
+						"enablePullDownRefresh": true
+					}
+				}
+			]
+		}
+	],
+	"globalStyle": {
+		// #ifdef H5
+		"navigationStyle": "custom",
+		// #endif
+		"navigationBarBackgroundColor": "#fff",
+		"navigationBarTitleText": "花卉宝",
+		"navigationBarTextStyle": "black"
+	},
+	"tabBar": {
+		"color": "#C0C4CC",
+		"selectedColor": "#fa436a",
+		"borderStyle": "black",
+		"backgroundColor": "#ffffff",
+		"list": [{
+				"pagePath": "pages/home/index",
+				"iconPath": "static/images/common/home-no.png",
+				"selectedIconPath": "static/images/common/home-is.png",
+				"text": "首页"
+			},
+			{
+				"pagePath": "pages/home/category",
+				"iconPath": "static/images/common/category-no.png",
+				"selectedIconPath": "static/images/common/category-is.png",
+				"text": "分类"
+			},
+			{
+				"pagePath": "pages/home/shop",
+				"iconPath": "static/images/common/shop-no.png",
+				"selectedIconPath": "static/images/common/shop-is.png",
+				"text": "门店"
+			},
+			{
+				"pagePath": "pages/home/user",
+				"iconPath": "static/images/common/user-no.png",
+				"selectedIconPath": "static/images/common/user-is.png",
+				"text": "我的"
+			}
+		]
+	}
+}
+

mobile-code/src/b-uni.scss → mobile-code/src/m-uni.scss

@@ -12,7 +12,7 @@ $imgUrl: 'https://wximg.meijiabang.com/hkds/miniapp/images/';
 
 // 所有样式为公共样式，已在全局引用可直接使用
 // 主色
-$mainColor: #3385FF;
+$mainColor: #FF2842;
 $mainColor1: #049E2C;
 $auxiliaryColor2: #ff6900;
 

mobile-code/src/manifest.json

@@ -90,7 +90,7 @@
         "usingComponents" : true,
         "permission" : {
             "scope.userLocation" : {
-                "desc" : "获取位置信息后为您提供个性化推荐"
+                "desc" : "请点击确定"
             }
         }
     },
@@ -121,7 +121,7 @@
             "port": 81,
             "proxy": {
                 "/api": {
-                    "target": "http://api.m.huaml.com",
+                    "target": "http://api.b.huaml.com",
                     "secure": false,
                     "changeOrigin": true,
                     "pathRewrite": {

mobile-code/src/pages.json

@@ -1,27 +1,21 @@
 {
 	"pages": [
 		{
-			"path": "pages/home/index",
+			"path": "admin/home/workbench",
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "工作台"
 			}
 		},
 		{
-			"path": "pages/home/category",
+			"path": "admin/home/order",
 			"style": {
-				"navigationBarTitleText": "分类"
+				"navigationBarTitleText": "订单"
 			}
 		},
 		{
-			"path": "pages/home/shop",
+			"path": "admin/home/member",
 			"style": {
-				"navigationBarTitleText": "门店"
-			}
-		},
-		{
-			"path": "pages/home/user",
-			"style": {
-				"navigationBarTitleText": "我的"
+				"navigationBarTitleText": "客户"
 			}
 		},
 		{
@@ -40,109 +34,242 @@
 	],
 	"subPackages": [
 		{
-			"root": "pages/user",
+			"root": "admin/order",
 			"pages": [
 				{
-					"path": "register",
+					"path": "detail",
 					"style": {
-						"navigationBarTitleText": "注册"
+						"navigationBarTitleText": "详情"
 					}
 				},
 				{
-					"path": "password",
+					"path": "ship",
 					"style": {
-						"navigationBarTitleText": "修改密码"
+						"navigationBarTitleText": "发货"
+					}
+				},
+				{
+					"path": "fill-form",
+					"style": {
+						"navigationBarTitleText": "填写收花人"
 					}
 				}
 			]
 		},
 		{
-			"root": "pages/goods",
+			"root": "admin/member",
 			"pages": [
+				{
+					"path": "add",
+					"style": {
+						"navigationBarTitleText": "添加客户"
+					}
+				},
 				{
 					"path": "detail",
 					"style": {
-						"navigationBarTitleText": "详情"
+						"navigationBarTitleText": "客户详情"
 					}
 				}
 			]
 		},
 		{
-			"root": "pages/pay",
+			"root": "admin/interest",
 			"pages": [
 				{
-					"path": "index",
+					"path": "invite",
 					"style": {
-						"navigationBarTitleText": ""
+						"navigationBarTitleText": "邀请列表"
+					}
+				},
+				{
+					"path": "my-invite",
+					"style": {
+						"navigationBarTitleText": "我的邀请"
+					}
+				},
+				{
+					"path": "setting",
+					"style": {
+						"navigationBarTitleText": "奖励设置"
 					}
 				}
 			]
 		},
 		{
-			"root": "pages/callback",
+			"root": "admin/coupon",
 			"pages": [
 				{
-					"path": "index"
+					"path": "list",
+					"style": {
+						"navigationBarTitleText": "优惠券"
+					}
 				}
 			]
 		},
 		{
-			"root": "pages/coupon",
+			"root": "admin/ad",
 			"pages": [
 				{
 					"path": "list",
 					"style": {
-						"navigationBarTitleText": "优惠券",
-						"enablePullDownRefresh": true
+						"navigationBarTitleText": "广告列表"
+					}
+				},
+				{
+					"path": "add",
+					"style": {
+						"navigationBarTitleText": "添加广告"
+					}
+				},
+				{
+					"path": "sel-goods",
+					"style": {
+						"navigationBarTitleText": "商品选择"
 					}
 				}
 			]
 		},
 		{
-			"root": "pages/order",
+			"root": "admin/staff",
 			"pages": [
 				{
 					"path": "list",
 					"style": {
-						"navigationBarTitleText": "订单列表",
-						"enablePullDownRefresh": true
+						"navigationBarTitleText": "员工管理"
 					}
 				},
 				{
-					"path": "detail",
+					"path": "add",
 					"style": {
-						"navigationBarTitleText": "订单列表"
+						"navigationBarTitleText": ""
 					}
 				},
 				{
-					"path": "buy",
+					"path": "sel-member",
 					"style": {
-						"navigationBarTitleText": "订单确认"
+						"navigationBarTitleText": "客户列表"
+					}
+				}
+			]
+		},
+		{
+			"root": "admin/shop",
+			"pages": [
+				{
+					"path": "list",
+					"style": {
+						"navigationBarTitleText": "店铺管理"
 					}
 				},
 				{
-					"path": "comment",
+					"path": "add",
 					"style": {
-						"navigationBarTitleText": "评价"
+						"navigationBarTitleText": ""
 					}
 				}
 			]
 		},
 		{
-			"root": "pages/interest",
+			"root": "admin/setting",
 			"pages": [
 				{
-					"path": "invite",
+					"path": "list",
 					"style": {
-						"navigationBarTitleText": "邀请排行",
-						"enablePullDownRefresh": true
+						"navigationBarTitleText": "设置"
+					}
+				},
+				{
+					"path": "wx-menu",
+					"style": {
+						"navigationBarTitleText": "微信菜单设置"
+					}
+				},
+				{
+					"path": "coupon",
+					"style": {
+						"navigationBarTitleText": "新人领券设置"
 					}
 				},
 				{
 					"path": "level",
 					"style": {
-						"navigationBarTitleText": "会员等级",
-						"enablePullDownRefresh": true
+						"navigationBarTitleText": "会员等级设置"
+					}
+				},
+				{
+					"path": "password",
+					"style": {
+						"navigationBarTitleText": "密码设置"
+					}
+				}
+			]
+		},
+		{
+			"root": "admin/goodsManage",
+			"pages": [
+				{
+					"path": "list",
+					"style": {
+						"navigationBarTitleText": "商品管理"
+					}
+				},
+				{
+					"path": "category",
+					"style": {
+						"navigationBarTitleText": "分类管理"
+					}
+				},
+				{
+					"path": "add",
+					"style": {
+						"navigationBarTitleText": "添加商品"
+					}
+				},
+				{
+					"path": "img-store",
+					"style": {
+						"navigationBarTitleText": "图库管理"
+					}
+				},
+				{
+					"path": "goods-name",
+					"style": {
+						"navigationBarTitleText": "填写商品信息"
+					}
+				},
+				{
+					"path": "freight",
+					"style": {
+						"navigationBarTitleText": "运费设置"
+					}
+				},
+				{
+					"path": "price-increase",
+					"style": {
+						"navigationBarTitleText": "节假日自动涨价"
+					}
+				}
+			]
+		},
+		{
+			"root": "admin/statistics",
+			"pages": [
+				{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "数据统计"
+					}
+				}
+			]
+		},
+		{
+			"root": "admin/assets",
+			"pages": [
+				{
+					"path": "list",
+					"style": {
+						"navigationBarTitleText": "收入明细"
 					}
 				}
 			]
@@ -158,6 +285,17 @@
 					}
 				}
 			]
+		},
+		{
+			"root": "admin/template",
+			"pages": [
+				{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "选择模板"
+					}
+				}
+			]
 		}
 	],
 	"globalStyle": {
@@ -170,32 +308,26 @@
 	},
 	"tabBar": {
 		"color": "#C0C4CC",
-		"selectedColor": "#fa436a",
+		"selectedColor": "#3385FF",
 		"borderStyle": "black",
 		"backgroundColor": "#ffffff",
 		"list": [{
-				"pagePath": "pages/home/index",
-				"iconPath": "static/images/common/home-no.png",
-				"selectedIconPath": "static/images/common/home-is.png",
-				"text": "首页"
-			},
-			{
-				"pagePath": "pages/home/category",
-				"iconPath": "static/images/common/category-no.png",
-				"selectedIconPath": "static/images/common/category-is.png",
-				"text": "分类"
+				"pagePath": "admin/home/workbench",
+				"iconPath": "static/images/admin/workbench-no.png",
+				"selectedIconPath": "static/images/admin/workbench-is.png",
+				"text": "工作台"
 			},
 			{
-				"pagePath": "pages/home/shop",
-				"iconPath": "static/images/common/shop-no.png",
-				"selectedIconPath": "static/images/common/shop-is.png",
-				"text": "门店"
+				"pagePath": "admin/home/order",
+				"iconPath": "static/images/admin/order-no.png",
+				"selectedIconPath": "static/images/admin/order-is.png",
+				"text": "订单"
 			},
 			{
-				"pagePath": "pages/home/user",
-				"iconPath": "static/images/common/user-no.png",
-				"selectedIconPath": "static/images/common/user-is.png",
-				"text": "我的"
+				"pagePath": "admin/home/member",
+				"iconPath": "static/images/admin/member-no.png",
+				"selectedIconPath": "static/images/admin/member-is.png",
+				"text": "客户"
 			}
 		]
 	}

mobile-code/src/uni.scss

@@ -12,7 +12,7 @@ $imgUrl: 'https://wximg.meijiabang.com/hkds/miniapp/images/';
 
 // 所有样式为公共样式，已在全局引用可直接使用
 // 主色
-$mainColor: #FF2842;
+$mainColor: #3385FF;
 $mainColor1: #049E2C;
 $auxiliaryColor2: #ff6900;