update

mobile-code/src/m-uni.scss

@@ -13,11 +13,11 @@ $imgUrl: 'https://wximg.meijiabang.com/hkds/miniapp/images/';
 // 所有样式为公共样式，已在全局引用可直接使用
 // 主色
 $mainColor: #FF2842;
-$mainColor1: #3A8840;
+$mainColor1: #049E2C;
 $auxiliaryColor2: #ff6900;
 
 $blueColor: #2965fe;
-$greenColor: #3A8840;
+$greenColor: #049E2C;
 $redColor: #ff3841;
 // 字体色
 $fontColorMain: #333333;

mobile-code/src/pages.json

@@ -1,5 +1,11 @@
 {
 	"pages": [
+		{
+			"path": "pages/login/index",
+			"style": {
+				"navigationBarTitleText": "登录"
+			}
+		},
 		{
 			"path": "pages/admin/workbench",
 			"style": {

mobile-code/src/pages/login/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="top">
-			<text class="top-title">美家帮OA办公系统</text>
+			<text class="top-title">管理系统</text>
 		</view>
 		<form>
 			<view class="uni-form-item uni-column">
@@ -53,7 +53,6 @@ export default {
 	},
 	methods: {
 		change(e) {
-			console.log(e)
 			if ((this.username == '') & (this.pssworld == '')) {
 				this.showstate = true
 			} else {

mobile-code/src/pages/order/admin/components/card-name.vue

@@ -1,11 +1,11 @@
 <template>
 	<div class="card-name-module">
-        <div class="card-tag">
-            <img src="../../../../static/images/order/tag.png" alt="" mode="widthFix" >
-        </div>
         <div class="app-size-30 app-color-0">赵志军</div>
         <div>153928282777</div>
         <div>福建省厦门市湖里区拉了军无呜呜号码129号之一3楼</div>
+        <div class="card-tag">
+            <img src="../../../../static/images/order/tag.png" alt="" mode="widthFix" >
+        </div>
     </div>
 </template>
 
@@ -33,6 +33,7 @@ export default {
         top: 0;
         right: 0;
         width: 100px;
+        margin-top: 0;
     }
 }
 </style>

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

@@ -0,0 +1,139 @@
+<template>
+	<div class="sel-confirm-module">
+		<!-- 列表 -->
+		<time-axis>
+			<!-- 完成 -->
+			<timeaxis-item class="axis-list axis-first com-wrap" bgcolor="none">
+				<template v-slot:node>
+					<div class="tui-node node-big">
+						<div class="node-small"></div>
+					</div>
+				</template>
+				<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">订单归类</button>
+						</div>
+					</div>
+				</template>
+			</timeaxis-item>
+			<!-- 送达 -->
+			<timeaxis-item class="axis-list com-wrap" bgcolor="none">
+				<template v-slot:content>
+					<div class="axis-slot-wrap">
+						<div class="axis-title">送达</div>
+						<div class="axis-det">
+							<div class="app-color-0 app-bold">2019-10-10 18:00:00</div>
+						</div>
+					</div>
+				</template>
+			</timeaxis-item>
+			<!-- 发货 -->
+			<timeaxis-item class="axis-list confirm-wrap" bgcolor="none">
+				<template v-slot:content>
+					<div class="axis-slot-wrap">
+						<div class="axis-title">发货</div>
+						<div class="axis-det">
+							<div class="app-color-0 app-bold">2019-10-10 18:00:00</div>
+							<div>配送方：达达</div>
+                            <div>距离：5.5km</div>
+                            <div>运费：¥28</div>
+                            <div>小费：¥5</div>
+                            <div>
+								<span>状态：</span>
+								<span class="app-color-4">待接单</span>
+							</div>
+						</div>
+					</div>
+				</template>
+			</timeaxis-item>
+			<!-- 打单 -->
+			<timeaxis-item class="axis-list com-wrap" bgcolor="none">
+				<template v-slot:content>
+					<div class="axis-slot-wrap">
+						<div class="axis-title">打单</div>
+						<div class="axis-det">
+							<div class="app-bold">2019-10-10 18:00:00</div>
+                            <card-name />
+                            <div class="btn-wrap-com">
+                                <button class="admin-button-com default">明细</button>
+                                <button class="admin-button-com default">打印</button>
+                            </div>
+						</div>
+					</div>
+				</template>
+			</timeaxis-item>
+			<!-- 下单 -->
+			<timeaxis-item class="axis-list com-wrap" bgcolor="none">
+				<template v-slot:content>
+					<div class="axis-slot-wrap">
+						<div class="axis-title">下单</div>
+						<div class="axis-det">
+							<div class="app-color-0 app-bold">2019-10-10 18:00:00</div>
+						</div>
+					</div>
+				</template>
+			</timeaxis-item>
+		</time-axis>
+	</div>
+</template>
+
+<script>
+import TimeAxis from '@/pages/admin/components/plugin/time-axis'
+import TimeaxisItem from '@/pages/admin/components/plugin/timeaxis-item'
+import CardName from './card-name'
+export default {
+	name: 'sel-confirm-module',
+	components: {
+		TimeAxis,
+		TimeaxisItem,
+		CardName
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+    // 完成
+    .axis-first {
+        .axis-det {
+            margin-top: 40px !important;
+        }
+        .confirm-btn {
+            width: 100%;
+        }
+    }
+    // 发货
+    .confirm-wrap {
+		.axis-slot-wrap {
+			top: -4px !important;
+		}
+		.axis-det {
+			margin-top: 20px;
+            margin-bottom: 10px;
+            color: $fontColor2;
+            & > div {
+                margin-top: 14px;
+                &:first-child {
+                    margin-top: 0;
+                }
+            }
+            .admin-button-com {
+                width: 120px;
+                margin-top: 20px;
+            }
+		}
+    }
+	// 打单
+	.com-wrap {
+		.axis-det {
+			margin-top: 14px;
+            & > div {
+                margin-top: 20px;
+                &:first-child {
+                    margin-top: 0;
+                }
+            }
+        }
+	}
+</style>

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

@@ -0,0 +1,134 @@
+<template>
+	<div class="sel-confirm-module">
+		<!-- 列表 -->
+		<time-axis>
+			<!-- 送达 -->
+			<timeaxis-item class="axis-list axis-first com-wrap" bgcolor="none">
+				<template v-slot:node>
+					<div class="tui-node node-big">
+						<div class="node-small"></div>
+					</div>
+				</template>
+				<template v-slot:content>
+					<div class="axis-slot-wrap">
+						<div class="axis-title">送达</div>
+						<div class="axis-det express-wrap">
+							<button class="admin-button-com big disable">确认已送达</button>
+							<div class="button-prompt">送达会自动通知客户哦</div>
+						</div>
+					</div>
+				</template>
+			</timeaxis-item>
+			<!-- 发货 -->
+			<timeaxis-item class="axis-list confirm-wrap" bgcolor="none">
+				<template v-slot:content>
+					<div class="axis-slot-wrap">
+						<div class="axis-title">发货</div>
+						<div class="axis-det">
+							<div class="app-color-0 app-bold">2019-10-10 18:00:00</div>
+							<div>配送方：达达</div>
+							<div>距离：5.5km</div>
+							<div>运费：¥28</div>
+							<div>小费：¥5</div>
+							<div>
+								<span>状态：</span>
+								<span class="app-color-4">待接单</span>
+							</div>
+						</div>
+					</div>
+				</template>
+			</timeaxis-item>
+			<!-- 打单 -->
+			<timeaxis-item class="axis-list com-wrap" bgcolor="none">
+				<template v-slot:content>
+					<div class="axis-slot-wrap">
+						<div class="axis-title">打单</div>
+						<div class="axis-det">
+							<div class="app-bold">2019-10-10 18:00:00</div>
+							<card-name />
+							<div class="btn-wrap-com">
+								<button class="admin-button-com default">明细</button>
+								<button class="admin-button-com default">打印</button>
+							</div>
+						</div>
+					</div>
+				</template>
+			</timeaxis-item>
+			<!-- 下单 -->
+			<timeaxis-item class="axis-list com-wrap" bgcolor="none">
+				<template v-slot:content>
+					<div class="axis-slot-wrap">
+						<div class="axis-title">下单</div>
+						<div class="axis-det">
+							<div class="app-color-0 app-bold">2019-10-10 18:00:00</div>
+						</div>
+					</div>
+				</template>
+			</timeaxis-item>
+		</time-axis>
+	</div>
+</template>
+
+<script>
+import TimeAxis from '@/pages/admin/components/plugin/time-axis'
+import TimeaxisItem from '@/pages/admin/components/plugin/timeaxis-item'
+import CardName from './card-name'
+export default {
+	name: 'sel-confirm-module',
+	components: {
+		TimeAxis,
+		TimeaxisItem,
+		CardName
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+	// 发货
+	.confirm-wrap {
+		.axis-slot-wrap {
+			top: -4px !important;
+		}
+		.axis-det {
+			margin-top: 20px;
+			margin-bottom: 10px;
+			color: $fontColor2;
+			& > div {
+				margin-top: 14px;
+				&:first-child {
+					margin-top: 0;
+				}
+			}
+			.admin-button-com {
+				width: 120px;
+				margin-top: 20px;
+			}
+			.modify-btn {
+				color: $mainColor;
+				font-size: 24px;
+				margin-left: 30px;
+			}
+		}
+	}
+	// 打单
+	.com-wrap {
+		.axis-det {
+			margin-top: 14px;
+			& > div {
+				margin-top: 20px;
+				&:first-child {
+					margin-top: 0;
+				}
+			}
+		}
+		.express-wrap {
+			.admin-button-com {
+				width: 100%;
+            }
+            .button-prompt {
+                text-align: center;
+                color: $fontColor2;
+            }
+		}
+	}
+</style>

mobile-code/src/pages/order/admin/components/sel-pending-order.vue

@@ -20,7 +20,10 @@
                                 <span>小费：¥5</span>
                                 <i class="iconfont iconbianjijiage1 modify-btn"></i>
                             </div>
-                            <div>状态：待接单</div>
+                            <div>
+								<span>状态：</span>
+								<span class="app-price">待接单</span>
+							</div>
                             <div>期待送花时间：2019-10-10 20:00:00</div>
                             <div class="admin-button-com default">取消</div>
 						</div>

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

@@ -1,12 +1,136 @@
 <template>
-	<div class="sel-ship-confirm-module"></div>
+	<div class="sel-ship-confirm-module">
+		<!-- 列表 -->
+		<time-axis>
+			<!-- 完成 -->
+			<timeaxis-item class="axis-list confirm-wrap" bgcolor="none">
+				<template v-slot:content>
+					<div class="axis-slot-wrap">
+						<div class="axis-title">送达</div>
+						<div class="axis-det">
+							<div class="app-color-0 app-bold">2019-10-10 18:00:00</div>
+							<div>订单归类: 花束/花盒</div>
+							<div>用途：送爱人/恋人</div>
+							<div>消息推送：已推送</div>
+						</div>
+					</div>
+				</template>
+			</timeaxis-item>
+			<!-- 送达 -->
+			<timeaxis-item class="axis-list com-wrap" bgcolor="none">
+				<template v-slot:content>
+					<div class="axis-slot-wrap">
+						<div class="axis-title">送达</div>
+						<div class="axis-det">
+							<div class="app-bold">2019-10-10 18:00:00</div>
+						</div>
+					</div>
+				</template>
+			</timeaxis-item>
+			<!-- 发货 -->
+			<timeaxis-item class="axis-list axis-first confirm-wrap" bgcolor="none">
+				<template v-slot:node>
+					<div class="tui-node node-big">
+						<div class="node-small"></div>
+					</div>
+				</template>
+				<template v-slot:content>
+					<div class="axis-slot-wrap">
+						<div class="axis-title">发货</div>
+						<div class="axis-det">
+							<div class="app-color-0 app-bold">2019-10-10 18:00:00</div>
+							<div>配送方：达达</div>
+                            <div>距离：5.5km</div>
+                            <div>运费：¥28</div>
+                            <div>小费：¥5</div>
+                            <div>状态：已接单</div>
+						</div>
+					</div>
+				</template>
+			</timeaxis-item>
+			<!-- 打单 -->
+			<timeaxis-item class="axis-list com-wrap" bgcolor="none">
+				<template v-slot:content>
+					<div class="axis-slot-wrap">
+						<div class="axis-title">打单</div>
+						<div class="axis-det">
+							<div class="app-bold">2019-10-10 18:00:00</div>
+                            <card-name />
+                            <div class="btn-wrap-com">
+                                <button class="admin-button-com default">明细</button>
+                                <button class="admin-button-com default">打印</button>
+                            </div>
+						</div>
+					</div>
+				</template>
+			</timeaxis-item>
+			<!-- 下单 -->
+			<timeaxis-item class="axis-list com-wrap" bgcolor="none">
+				<template v-slot:content>
+					<div class="axis-slot-wrap">
+						<div class="axis-title">下单</div>
+						<div class="axis-det">
+							<div class="app-bold">2019-10-10 18:00:00</div>
+						</div>
+					</div>
+				</template>
+			</timeaxis-item>
+		</time-axis>
+	</div>
 </template>
 
 <script>
+import TimeAxis from '@/pages/admin/components/plugin/time-axis'
+import TimeaxisItem from '@/pages/admin/components/plugin/timeaxis-item'
+import CardName from './card-name'
 export default {
-	name: 'sel-ship-confirm-module'
+	name: 'sel-ship-confirm-module',
+	components: {
+		TimeAxis,
+		TimeaxisItem,
+		CardName
+	}
 }
 </script>
 
 <style lang="scss" scoped>
+    // 发货
+    .confirm-wrap {
+		.axis-slot-wrap {
+			top: -4px !important;
+		}
+		.axis-det {
+			margin-top: 20px;
+            margin-bottom: 10px;
+            color: $fontColor2;
+            & > div {
+                margin-top: 10px;
+                &:first-child {
+                    margin-top: 0;
+                }
+            }
+            .admin-button-com {
+                width: 120px;
+                margin-top: 20px;
+            }
+            .modify-btn {
+                color: $mainColor;
+                font-size: 24px;
+                margin-left: 30px;
+            }
+		}
+    }
+	// 打单
+	.com-wrap {
+		.axis-det {
+			margin-top: 14px;
+            & > div {
+                margin-top: 20px;
+                &:first-child {
+                    margin-top: 0;
+                }
+            }
+		}
+	}
 </style>
+

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

@@ -43,6 +43,18 @@
 			<block v-if="showIndex == 3">
 				<sel-pending-order />
 			</block>
+			<!-- 发货选择快递送已接单 -->
+			<block v-if="showIndex == 4">
+				<sel-express-confirm />
+			</block>
+			<!-- 发货选择完成 -->
+			<block v-if="showIndex == 5">
+				<sel-confirm />
+			</block>
+			<!-- 发货管理完成 -->
+			<block v-if="showIndex == 6">
+				<sel-ship-confirm />
+			</block>
 		</div>
 	</div>
 </template>
@@ -56,17 +68,26 @@ import SelShip from './components/sel-ship'
 import SelMention from './components/sel-mention'
 // 快递送待接单
 import SelPendingOrder from './components/sel-pending-order'
+// 发货选择快递送已接单
+import SelExpressConfirm from './components/sel-express-confirm'
+// 发货选择完成
+import SelConfirm from './components/sel-confirm'
+// 发货管理完成
+import SelShipConfirm from './components/sel-ship-confirm'
 export default {
 	name: 'admin-ship',
 	components: {
 		SelOrder,
 		SelShip,
 		SelMention,
-		SelPendingOrder
+		SelPendingOrder,
+		SelExpressConfirm,
+		SelConfirm,
+		SelShipConfirm
 	},
 	data() {
 		return {
-			showIndex: 3
+			showIndex: 5
 		}
 	}
 }

mobile-code/src/static/css/base.scss

@@ -121,6 +121,10 @@
     color: $fontColor3;
 }
 
+.app-color-4 {
+    color: $mainColor1;
+}
+
 // 金额
 .app-price {
 	color: #FF2842;

mobile-code/src/static/css/common.scss

@@ -86,6 +86,11 @@ body {
         background-color: #f5f5f5;
     }
 }
+.button-com.disable {
+    color: #fff;
+    background-color: #ccc;
+    border-color: #ccc;
+}
 // ============ 后台 =============
 .admin-button-com {
     display: inline-block;
@@ -129,6 +134,11 @@ body {
     }
 }
 
+.admin-button-com.disable {
+    color: #fff;
+    background-color: #ccc;
+    border-color: #ccc;
+}
 // ======================= 输入框公共样式 - start ====================
 .input-line-wrap {
     // 是否必填

mobile-code/src/uni.scss

@@ -13,11 +13,11 @@ $imgUrl: 'https://wximg.meijiabang.com/hkds/miniapp/images/';
 // 所有样式为公共样式，已在全局引用可直接使用
 // 主色
 $mainColor: #3385FF;
-$mainColor1: #3A8840;
+$mainColor1: #049E2C;
 $auxiliaryColor2: #ff6900;
 
 $blueColor: #2965fe;
-$greenColor: #3A8840;
+$greenColor: #049E2C;
 $redColor: #ff3841;
 // 字体色
 $fontColorMain: #333333;