还是文字

shop/src/views/order/components/sel-order.vue

@@ -129,7 +129,6 @@
 										</el-popover>
 										<div class="prompt-text">确认后会通知客户</div>
 									</template>
-
 								</div>
 							</template>
 							<!-- 订单分类 -->

shop/src/views/setting/level.vue

@@ -38,7 +38,7 @@
 		</div>
 		<!-- 提示 -->
 		<div v-if="isModify" class="prompt-text">
-			提交后将不能再修改，请确认后提交。
+			提交后不能再修改，请确认后提交。
 		</div>
 		<!-- 按钮 -->
 		<div v-if="isModify" class="btn-wrap">

store/src/admin/home/order.vue

@@ -37,7 +37,7 @@
           <div class="list-bottom">
             <div>
               <span class="freight-text">运费：￥{{ item.sendCost }}</span>
-              <span>应付金额：</span>
+              <span>金额：</span>
               <span class="app-size-30 app-bold">¥{{ item.actPrice }}</span>
             </div>
 

store/src/admin/order/components/sel-ship-confirm.vue

@@ -62,9 +62,9 @@
 							<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>
+								<div>已手写</div>
 							</block>
-							<div class="btn-wrap-com">
+							<div class="btn-wrap-com" v-if="!$util.isEmpty(orderComData[2].receive)" >
 								<!-- <button class="admin-button-com default">明细</button> -->
 								<button class="admin-button-com default" @click="() => { alert('打印功能待开发！') }">重打</button>
 							</div>

store/src/admin/order/components/sel-ship-manage.vue

@@ -51,7 +51,7 @@
 			</timeaxis-item>
 		</time-axis>
 		<!-- ship -->
-		<modal-module :show="shipModal" :maskClosable="false" @cancel="modalCancel" @click="shipModalClick" title="确认发货？" padding="30rpx 30rpx">
+		<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">
@@ -219,7 +219,7 @@ export default {
 			this.selfShipModal = false
 		},
 		mobilePrintFn(){
-		    this.$msg('此功能即将开通')
+		    this.$msg('即将开通')
 		}
 	}
 }

store/src/admin/order/components/sel-ship.vue

@@ -1,9 +1,9 @@
 <template>
-	<div class="sel-ship-module">
-		<!-- 列表 -->
-		<time-axis>
-			<!-- 发货 -->
-			<!-- <timeaxis-item class="axis-list axis-first ship-goods" bgcolor="none">
+  <div class="sel-ship-module">
+    <!-- 列表 -->
+    <time-axis>
+      <!-- 发货 -->
+      <!-- <timeaxis-item class="axis-list axis-first ship-goods" bgcolor="none">
 				<template v-slot:node>
 					<div class="tui-node node-big">
 						<div class="node-small"></div>
@@ -18,120 +18,122 @@
 						</div>
 					</div>
 				</template>
-			</timeaxis-item> -->
-			<!-- 制单 -->
-			<timeaxis-item class="axis-list axis-first print-order" bgcolor="none">
-				<template v-slot:content>
-					<div class="axis-slot-wrap">
-						<div class="axis-title">制单</div>
-						<div class="axis-det">
-							<div>{{ orderComData[0].addTime | formatTime }}</div>
-                            <card-name :info="orderComData[0].receive" />
-                            <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" @click="mobilePrintFn">打印</button>
-                                <button class="admin-button-com default" @click="printOrderFn">确定</button>
-                            </div>
-						</div>
-					</div>
-				</template>
-			</timeaxis-item>
-			<!-- 下单 -->
-			<timeaxis-item class="axis-list down-order" bgcolor="none">
-				<template v-slot:content>
-					<div class="axis-slot-wrap">
-						<div class="axis-title">{{ orderComData[1].actionName }}</div>
-						<div class="axis-det">
-							<div>{{ orderComData[1].addTime | formatTime }}</div>
-						</div>
-					</div>
-				</template>
-			</timeaxis-item>
-		</time-axis>
-	</div>
+      </timeaxis-item>-->
+      <!-- 制单 -->
+      <timeaxis-item class="axis-list axis-first print-order" bgcolor="none">
+        <template v-slot:content>
+          <div class="axis-slot-wrap">
+            <div class="axis-title">制单</div>
+            <div class="axis-det">
+              <div>{{ orderComData[0].addTime | formatTime }}</div>
+              <card-name :info="orderComData[0].receive" />
+              <div class="btn-wrap-com">
+                <button class="admin-button-com default" @click="mobilePrintFn">打印</button>
+                <button class="admin-button-com default" @click="modifyPrintFn">修改</button>
+                <button class="admin-button-com default" @click="printOrderFn">下一步</button>
+              </div>
+            </div>
+          </div>
+        </template>
+      </timeaxis-item>
+      <!-- 下单 -->
+      <timeaxis-item class="axis-list down-order" bgcolor="none">
+        <template v-slot:content>
+          <div class="axis-slot-wrap">
+            <div class="axis-title">{{ orderComData[1].actionName }}</div>
+            <div class="axis-det">
+              <div>{{ orderComData[1].addTime | formatTime }}</div>
+            </div>
+          </div>
+        </template>
+      </timeaxis-item>
+    </time-axis>
+  </div>
 </template>
 
 <script>
-import TimeAxis from '@/admin/home/components/plugin/time-axis'
-import TimeaxisItem from '@/admin/home/components/plugin/timeaxis-item'
-import CardName from './card-name'
+import TimeAxis from "@/admin/home/components/plugin/time-axis";
+import TimeaxisItem from "@/admin/home/components/plugin/timeaxis-item";
+import CardName from "./card-name";
 // api
-import { printOrder } from '@/api/order'
+import { printOrder } from "@/api/order";
 export default {
-	name: 'sel-order-module',
-	components: {
-		TimeAxis,
-		TimeaxisItem,
-		CardName
-	},
-	props: {
-		query: {
-			type: Object,
-			default: () => {}
-		},
-		orderData: {
-			type: Object,
-			default: () => {}
-		},
-		orderComData: {
-			type: Array,
-			default: () => []
-		}
-	},
-	methods: {
-		printOrderFn() {
-			printOrder({
-				id: this.orderData.id,
-				option: 2
-			}).then(res => {
-				this.$util.pageTo({
-					url: '/admin/order/ship',
-					query: {
-						id: this.orderData.id,
-						pageStatus: 7
-					}
-				})
-			})
-		},
-		mobilePrintFn(){
-            this.$msg('此功能即将开通')
-		}
-	}
-}
+  name: "sel-order-module",
+  components: {
+    TimeAxis,
+    TimeaxisItem,
+    CardName
+  },
+  props: {
+    query: {
+      type: Object,
+      default: () => {}
+    },
+    orderData: {
+      type: Object,
+      default: () => {}
+    },
+    orderComData: {
+      type: Array,
+      default: () => []
+    }
+  },
+  methods: {
+    printOrderFn() {
+      printOrder({
+        id: this.orderData.id,
+        option: 2
+      }).then(res => {
+        this.$util.pageTo({
+          url: "/admin/order/ship",
+          query: {
+            id: this.orderData.id,
+            pageStatus: 7
+          }
+        });
+      });
+    },
+    mobilePrintFn() {
+      this.$msg("即将开通");
+    },
+    modifyPrintFn() {
+      this.$msg("即将开通");
+    }
+  }
+};
 </script>
 
 <style lang="scss" scoped>
-    // 发货
-    .ship-goods {
-		.axis-slot-wrap {
-			top: -4px !important;
-		}
-		.axis-det {
-			@include disFlex(center, space-between);
-			margin-top: 50px;
-			margin-bottom: 10px;
-			.admin-button-com {
-				width: 48%;
-			}
-		}
+// 发货
+.ship-goods {
+  .axis-slot-wrap {
+    top: -4px !important;
+  }
+  .axis-det {
+    @include disFlex(center, space-between);
+    margin-top: 50px;
+    margin-bottom: 10px;
+    .admin-button-com {
+      width: 48%;
     }
-	// 制单
-	.print-order {
-		.axis-det {
-            margin-top: 14px;
-            & > div {
-                margin-top: 20px;
-                &:first-child {
-                    margin-top: 0;
-                }
-            }
-		}
-	}
-	// 下单
-	.down-order {
-		.axis-det {
-			margin-top: 14px;
-		}
-	}
+  }
+}
+// 制单
+.print-order {
+  .axis-det {
+    margin-top: 14px;
+    & > div {
+      margin-top: 20px;
+      &:first-child {
+        margin-top: 0;
+      }
+    }
+  }
+}
+// 下单
+.down-order {
+  .axis-det {
+    margin-top: 14px;
+  }
+}
 </style>

store/src/directives/anchor/index.js

@@ -8,7 +8,6 @@ export default {}
 
 Vue.directive('anchor', {
 	inserted: function(el, binding) {
-		console.log('88888888')
 		let topVal = binding.value.topVal ? binding.value.topVal : 0
 		// el.onclick = function () {
 		//     document.documentElement.scrollTop = $(binding.value.bindVal).offset().top - topVal
@@ -26,7 +25,6 @@ Vue.directive('anchor', {
 		}, true)*/
 		wx.createSelectorQuery().select(`'${binding.value.bindVal}'`).boundingClientRect().exec(function(res) {
 			let height = res[0].height
-			console.log('88888888')
 			console.log(binding.value.bindVal)
 			console.log(height)
 		})