订单流程

hdApp/src/admin/home/order.vue

@@ -85,12 +85,6 @@
                   >发货</div>
                 </template>
               </template>
-              <template v-if="item.payStatus == 1 && item.classify == 0">
-                <div
-                  class="admin-button-com mini"
-                  @click.stop="classifyOrder(item.id)"
-                >分类</div>
-              </template>
             </div>
           </div>
         </div>

hdApp/src/admin/home/workbench.vue

@@ -360,6 +360,7 @@ export default {
     },
     goToMallPt (url) {
       let self = this
+      console.log(url + '?account=' + self.loginInfo.shopId)
       getWeixinId().then(res => {
         uni.navigateToMiniProgram({
           appId: res.data.mall.miniAppId,

hdApp/src/admin/order/components/sel-express-confirm.vue

@@ -14,7 +14,6 @@
             <div class="axis-title">送达</div>
             <div class="axis-det express-wrap">
               <button class="admin-button-com big blue" @click="askConfirmReachFn">确认</button>
-              <div class="button-prompt">确认后会通知客户</div>
             </div>
           </div>
         </template>
@@ -58,12 +57,6 @@
               <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" @click="mobilePrintFn">重打</button>
-                  <button class="admin-button-com default" @click="printerSetFn">打印机</button>
-                </div>
-              </block>
             </div>
           </div>
         </template>

hdApp/src/admin/order/components/sel-order.vue

@@ -30,7 +30,7 @@
 					<div class="axis-slot-wrap">
 						<div class="axis-title">下单</div>
 						<div class="axis-det">
-							<div>{{ orderData.addTime | formatTime }}</div>
+							<div>{{ orderData.addTime}}</div>
 						</div>
 					</div>
 				</template>

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

@@ -59,10 +59,6 @@
               <block v-else>
                 <div>已手写</div>
               </block>
-              <div class="btn-wrap-com" v-if="!$util.isEmpty(orderComData[2].receive)">
-                <button class="admin-button-com default" @click="() => { alert('打印功能待开发！') }">重打</button>
-                <button class="admin-button-com default" @click="printerSetFn">打印机</button>
-              </div>
             </div>
           </div>
         </template>

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

@@ -25,7 +25,7 @@
                 class="admin-button-com big blue confirm-btn"
                 @click="sendShipFn"
                 style="margin:auto;"
-              >代送</button>
+              >快递送</button>
             </div>
           </div>
         </template>
@@ -40,8 +40,8 @@
               <block v-if="!$util.isEmpty(orderComData[1].receive)">
                 <card-name :info="orderComData[1].receive" />
                 <div class="btn-wrap-com">
-                  <button class="admin-button-com default" @click="mobilePrintFn">重打</button>
-                  <button class="admin-button-com default" @click="printerSetFn">打印机</button>
+                  <!-- <button class="admin-button-com default" @click="mobilePrintFn">重打</button> -->
+                  <!--<button class="admin-button-com default" @click="printerSetFn">打印机</button>-->
                 </div>
               </block>
             </div>
@@ -70,36 +70,39 @@
     >
       <template v-slot:content>
         <div class="app-modal-input-wrap ship-modal">
+
           <div class="inp-list-line">
-            <div class="line-label">送花时间</div>
+            <div class="line-label">配送方</div>
             <div class="line-input">
               <picker
-                mode="multiSelector"
-                :range="timeList"
-                :value="timeValue"
-                @change="changeTimeFn"
+                mode="selector"
+                :range="deliveryList"
+                @change="changeDeliveryFn"
+                range-key="text"
                 class="inp-select"
               >
-                <div v-if="form.sendTime">{{ form.sendTime }}</div>
+                <div v-if="form.sendSide">{{ sendSideText }}</div>
                 <div class="tui-placeholder" v-else>请选择</div>
               </picker>
             </div>
           </div>
+
           <div class="inp-list-line">
-            <div class="line-label">配送方</div>
+            <div class="line-label">送花时间</div>
             <div class="line-input">
               <picker
-                mode="selector"
-                :range="deliveryList"
-                @change="changeDeliveryFn"
-                range-key="text"
+                mode="multiSelector"
+                :range="timeList"
+                :value="timeValue"
+                @change="changeTimeFn"
                 class="inp-select"
               >
-                <div v-if="form.sendSide">{{ sendSideText }}</div>
+                <div v-if="form.sendTime">{{ form.sendTime }}</div>
                 <div class="tui-placeholder" v-else>请选择</div>
               </picker>
             </div>
           </div>
+
         </div>
       </template>
     </modal-module>

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

@@ -30,7 +30,7 @@
               <div class="btn-wrap-com">
                 <button class="admin-button-com default" @click="printOrderFn">打印</button>
                 <button class="admin-button-com default" @click="modifyPrintFn">修改</button>
-                <button class="admin-button-com default" @click="printerSetFn">打印机</button>
+                <!--<button class="admin-button-com default" @click="printerSetFn">打印机</button>-->
               </div>
             </div>
           </div>

hdApp/src/admin/order/fill-form.vue

@@ -1,115 +1,102 @@
 <template>
-	<div class="app-content">
-		<form @submit="formSubmit">
-			<app-delivery-module ref="appDelivery" />
-			<!-- 匿名派送 -->
-			<!-- <div class="none-name-delivery flex-center">
-				<checkbox class="ljd-checkbox" @change="anonymityChange"></checkbox>
-				<span class="none-name-text">匿名派送</span>
-			</div> -->
-			<!-- 按钮 -->
-			<div class="app-footer">
-				<button class="admin-button-com blue middle" formType="submit">提交</button>
-			</div>
-		</form>
-	</div>
+  <div class="app-content">
+    <form @submit="formSubmit">
+      <app-delivery-module ref="appDelivery" />
+      <!-- 按钮 -->
+      <div class="app-footer">
+        <button class="admin-button-com blue middle" formType="submit">
+          提交
+        </button>
+      </div>
+    </form>
+  </div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
-import AppDeliveryModule from '@/components/app-delivery'
-const form = require('@/utils/formValidation.js')
-// api
-// import { getShopUser } from '@/utils/auth'
-import { getOrderShop } from '@/utils/config'
-import { updateSheet } from '@/api/order'
+import { mapGetters } from "vuex";
+import AppDeliveryModule from "@/components/app-delivery";
+const form = require("@/utils/formValidation.js");
+import { getOrderShop } from "@/utils/config";
+import { updateSheet } from "@/api/order";
 export default {
-	name: 'fill-form',
-	components: {
-		AppDeliveryModule
-	},
-	data() {
-		return {
-			// 初始form
-			form: {
-				anonymity: '0' // 是否匿名 0不 1要
-			}
-		}
-	},
-	computed: {
-		...mapGetters({ orderShop: 'getOrderShop' }),
-		// ...mapGetters({ shopUser: 'getShopUser' })
-	},
-	onLoad() {
-		// this.init()
-	},
-	methods: {
-		init() {
-			getOrderShop()
-			// getShopUser()
-		},
-		confirmFn() {
-			let form = this.$refs.appDelivery.form ? this.$refs.appDelivery.form : {}
-			let region = this.$refs.appDelivery.region ? this.$refs.appDelivery.region : {}
-			updateSheet({
-				id: this.option.id,
-				...this.form,
-				...form,
-				...region
-			}).then(res => {
-				uni.navigateBack({
-				});
-				// this.$util.pageTo({
-				// 	url: '/admin/order/ship',
-				// 	type: 2,
-				// 	query: {
-				// 		id: this.option.id,
-				// 		pagestatus: 1
-				// 	}
-				// })
-			})
-		},
-		// operate
-		anonymityChange(e) {
-			this.form.anonymity = this.form.anonymity == 1 ? 0 : 1
-		},
-		// 表单验证
-		formSubmit(e) {
-			// 表单规则
-			let rules = [
-				// {
-				// 	name: 'receiveUserName',
-				// 	rule: ['required'],
-				// 	msg: ['请输入姓名']
-				// }
-			]
-			// 进行表单检查
-			let formData = e.detail.value
-			let checkRes = form.validation(formData, rules)
-			// 验证通过!
-			if (!checkRes) {
-				this.confirmFn()
-			} else {
-				this.$msg(checkRes)
-			}
-		}
-	}
-}
+  name: "fill-form",
+  components: {
+    AppDeliveryModule,
+  },
+  data() {
+    return {
+      form: {},
+    };
+  },
+  computed: {
+    ...mapGetters({ orderShop: "getOrderShop" }),
+  },
+  onLoad() {},
+  methods: {
+    init() {
+      getOrderShop();
+    },
+    confirmFn() {
+      let form = this.$refs.appDelivery.form ? this.$refs.appDelivery.form : {};
+      let region = this.$refs.appDelivery.region
+        ? this.$refs.appDelivery.region
+        : {};
+      updateSheet({
+        id: this.option.id,
+        ...this.form,
+        ...form,
+        ...region,
+      }).then((res) => {
+        uni.navigateBack({});
+      });
+    },
+    // 表单验证
+    formSubmit(e) {
+      // 表单规则
+      let rules = [
+        {
+          name: "receiveUserName",
+          rule: ["required"],
+          msg: ["请输入收花人姓名"],
+        },
+        {
+          name: "receiveMobile",
+          rule: ["required"],
+          msg: ["请输入收花人手机号"],
+        },
+        {
+          name: "fullAddress",
+          rule: ["required"],
+          msg: ["请输入地址"],
+        }
+      ];
+      // 进行表单检查
+      let formData = this.$refs.appDelivery.form
+      let checkRes = form.validation(formData, rules);
+      // 验证通过!
+      if (!checkRes) {
+        this.confirmFn();
+      } else {
+        this.$msg(checkRes);
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	// 匿名派送
-	.none-name-delivery {
-		padding-left: 30px;
-		margin-top: 40px;
-		.none-name-text {
-			margin-left: 14px;
-			color: $fontColor2;
-		}
-	}
-	.app-footer {
-		.admin-button-com {
-			width: 90%;
-		}
-	}
-</style>
+// 匿名派送
+.none-name-delivery {
+  padding-left: 30px;
+  margin-top: 40px;
+  .none-name-text {
+    margin-left: 14px;
+    color: $fontColor2;
+  }
+}
+.app-footer {
+  .admin-button-com {
+    width: 90%;
+  }
+}
+</style>

hdApp/src/admin/order/ship.vue

@@ -1,274 +1,271 @@
 <template>
-	<div class="app-content">
-		<!-- order-top -->
-		<div class="module-com order-wrap" v-if="!$util.isEmpty(data)">
-			<div class="order-det">
-				<div>
-					<div class="label">订单号</div>
-					<div>{{ data.orderSn }}</div>
-				</div>
-				<div>
-					<div class="label">下单时间</div>
-					<div>{{ data.addTime | formatTime }}</div>
-				</div>
-				<div v-if="!$util.isEmpty(data.goodsInfoList)">
-					<div class="label">商品名称</div>
-					<div>{{ data.goodsInfoList[0].title }}</div>
-				</div>
-				<div>
-					<div class="label">金额</div>
-					<div>¥{{ data.actPrice }}</div>
-				</div>
-			</div>
-			<div class="order-img" v-if="!$util.isEmpty(data.goodsInfoList)">
-				<img :src="data.goodsInfoList[0].smallCoverUrl" alt="商品图" mode="widthFix" />
-			</div>
-		</div>
-		<!-- order-bottom -->
-		<div class="module-com order-axis" v-if="showIndex != null">
-			<!-- 列表 -->
-			<!-- 选择订单 -->
-			<block v-if="showIndex == 0">
-				<sel-order
-					@nextPageSuccess="nextPageSuccess"
-					:orderData="data" 
-					:query="option" />
-			</block>
-			<!-- 选择发货 -->
-			<block v-if="showIndex == 1">
-				<sel-ship
-				@nextPageSuccess="nextPageSuccess"
-				:orderData="data" 
-				:query="option" 
-				:orderComData="orderComData" />
-			</block>
-			<!-- 选择自提 -->
-			<!-- <block v-if="showIndex == 2">
-				<sel-mention :orderData="data" :query="option" />
-			</block> -->
-			<!-- 快递送待接单 -->
-			<!-- <block v-if="showIndex == 3">
-				<sel-pending-order :orderData="data" :query="option" :orderComData="orderComData" />
-			</block> -->
-			<!-- 发货选择快递送已接单 -->
-			<block v-if="showIndex == 4">
-				<sel-express-confirm
-				@nextPageSuccess="nextPageSuccess"
-				:orderData="data" 
-				:query="option" 
-				:orderComData="orderComData" />
-			</block>
-			<!-- 发货选择完成 -->
-			<block v-if="showIndex == 5">
-				<sel-confirm
-					@nextPageSuccess="nextPageSuccess"
-					:orderData="data" 
-					:query="option" 
-					:orderComData="orderComData" />
-			</block>
-			<!-- 发货管理完成 -->
-			<block v-if="showIndex == 6">
-				<sel-ship-confirm @nextPageSuccess="nextPageSuccess" :orderData="data" :query="option" :orderComData="orderComData" />
-			</block>
-			<!-- 有配送单-发货管理 -->
-			<block v-if="showIndex == 7">
-				<sel-ship-manage
-					@nextPageSuccess="nextPageSuccess"
-					:orderData="data" 
-					:query="option" 
-					:orderComData="orderComData" />
-			</block>
-		</div>
+  <div class="app-content">
+    <!-- order-top -->
+    <div class="module-com order-wrap" v-if="!$util.isEmpty(data)">
+      <div class="order-det">
+        <div>
+          <div class="label">订单号</div>
+          <div>{{ data.orderSn }}</div>
+        </div>
+        <div>
+          <div class="label">下单时间</div>
+          <div>{{ data.addTime }}</div>
+        </div>
+        <div v-if="!$util.isEmpty(data.goodsInfoList)">
+          <div class="label">商品名称</div>
+          <div>{{ data.goodsInfoList[0].title }}</div>
+        </div>
+        <div>
+          <div class="label">金额</div>
+          <div>¥{{ data.actPrice }}</div>
+        </div>
+      </div>
+      <div class="order-img" v-if="!$util.isEmpty(data.goodsInfoList)">
+        <img
+          :src="data.goodsInfoList[0].smallCoverUrl"
+          alt="商品图"
+          mode="widthFix"
+        />
+      </div>
+    </div>
+    <!-- order-bottom -->
+    <div class="module-com order-axis" v-if="showIndex != null">
+      <!-- 列表 -->
+      <!-- 选择订单 -->
+      <block v-if="showIndex == 0">
+        <sel-order
+          @nextPageSuccess="nextPageSuccess"
+          :orderData="data"
+          :query="option"
+        />
+      </block>
+      <!-- 选择发货 -->
+      <block v-if="showIndex == 1">
+        <sel-ship
+          @nextPageSuccess="nextPageSuccess"
+          :orderData="data"
+          :query="option"
+          :orderComData="orderComData"
+        />
+      </block>
+      <!-- 发货选择快递送已接单 -->
+      <block v-if="showIndex == 4">
+        <sel-express-confirm
+          @nextPageSuccess="nextPageSuccess"
+          :orderData="data"
+          :query="option"
+          :orderComData="orderComData"
+        />
+      </block>
+      <!-- 发货选择完成 -->
+      <block v-if="showIndex == 5">
+        <sel-confirm
+          @nextPageSuccess="nextPageSuccess"
+          :orderData="data"
+          :query="option"
+          :orderComData="orderComData"
+        />
+      </block>
+      <!-- 发货管理完成 -->
+      <block v-if="showIndex == 6">
+        <sel-ship-confirm
+          @nextPageSuccess="nextPageSuccess"
+          :orderData="data"
+          :query="option"
+          :orderComData="orderComData"
+        />
+      </block>
+      <!-- 有配送单-发货管理 -->
+      <block v-if="showIndex == 7">
+        <sel-ship-manage
+          @nextPageSuccess="nextPageSuccess"
+          :orderData="data"
+          :query="option"
+          :orderComData="orderComData"
+        />
+      </block>
+    </div>
     <kd-entrance></kd-entrance>
-	</div>
+  </div>
 </template>
 
 <script>
 // 选择订单
-import SelOrder from './components/sel-order'
+import SelOrder from "./components/sel-order";
 // 选择发货
-import SelShip from './components/sel-ship'
+import SelShip from "./components/sel-ship";
 // 选择自提
-import SelMention from './components/sel-mention'
+import SelMention from "./components/sel-mention";
 // 快递送待接单
-import SelPendingOrder from './components/sel-pending-order'
+import SelPendingOrder from "./components/sel-pending-order";
 // 发货选择快递送已接单
-import SelExpressConfirm from './components/sel-express-confirm'
+import SelExpressConfirm from "./components/sel-express-confirm";
 // 发货选择完成
-import SelConfirm from './components/sel-confirm'
+import SelConfirm from "./components/sel-confirm";
 // 发货管理完成
-import SelShipConfirm from './components/sel-ship-confirm'
+import SelShipConfirm from "./components/sel-ship-confirm";
 // 有配送单-发货管理
-import SelShipManage from './components/sel-ship-manage'
+import SelShipManage from "./components/sel-ship-manage";
 
-import { getDetB, orderSendDet } from '@/api/order'
+import { getDetB, orderSendDet } from "@/api/order";
 export default {
-	name: 'admin-ship',
-	components: {
-		SelOrder,
-		SelShip,
-		SelMention,
-		SelPendingOrder,
-		SelExpressConfirm,
-		SelConfirm,
-		SelShipConfirm,
-		// 有配送单
-		SelShipManage
-	},
-	data() {
-		return {
-			showIndex: null,
-			data: {},
-			orderComData: []
-		}
-	},
-	onLoad() {
-		uni.showLoading({
-			title: '加载中...',
-			mask: true
-		})
-		// this.init()
-	},
-	onShow(){
-		this.init()
-	},
-	methods: {
-		nextPageSuccess(val){
-			this.option.pageStatus = val.pageStatus;
-			this.option.id = val.id
-			this.init()
-		},
-		init() {
-			// this.showIndex = this.option.pageStatus || 0
-			this._getDet()
-
-			this._orderComDet()
-
-		},
-		_getDet() {
-			return getDetB({ id: this.option.id }).then(res => {
-				this.data = res.data
-			})
-		},
-		_orderComDet() {
-			orderSendDet({ id: this.option.id }).then(res => {
-				this.orderComData = res.data
-				this.getPageStatus()
-			})
-		},
-		getPageStatus() {
-			uni.hideLoading()
-			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
-					// }
-				}
-			}
-		}
-	}
-}
+  name: "admin-ship",
+  components: {
+    SelOrder,
+    SelShip,
+    SelMention,
+    SelPendingOrder,
+    SelExpressConfirm,
+    SelConfirm,
+    SelShipConfirm,
+    // 有配送单
+    SelShipManage,
+  },
+  data() {
+    return {
+      showIndex: null,
+      data: {},
+      orderComData: [],
+    };
+  },
+  onLoad() {
+    uni.showLoading({
+      title: "加载中...",
+      mask: true,
+    });
+    // this.init()
+  },
+  onShow() {
+    this.init();
+  },
+  methods: {
+    nextPageSuccess(val) {
+      this.option.pageStatus = val.pageStatus;
+      this.option.id = val.id;
+      this.init();
+    },
+    init() {
+      this._getDet();
+      this._orderComDet();
+    },
+    _getDet() {
+      return getDetB({ id: this.option.id }).then((res) => {
+        this.data = res.data;
+      });
+    },
+    _orderComDet() {
+      orderSendDet({ id: this.option.id }).then((res) => {
+        this.orderComData = res.data;
+        this.getPageStatus();
+      });
+    },
+    getPageStatus() {
+      uni.hideLoading();
+      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 {
+          this.showIndex = 6;
+        }
+      }
+    },
+  },
+};
 </script>
-
 <style lang="scss" scoped>
-	.app-content {
-		background-color: #fff;
-	}
-	// 公共
-	.module-com {
-		padding: 30px;
-		// margin-bottom: 20px;
-	}
-	// 订单信息
-	.order-wrap {
-		@include disFlex(center, space-between);
-		padding: 20px;
-		border-bottom: 20px solid $backColor;
-		.order-det {
-			font-size: 24px;
-			& > div {
-				@include disFlex(center, flex-start);
-				margin-top: 12px;
-				&:first-child {
-					margin-top: 0;
-				}
-				.label {
-					width: 120px;
-					color: $fontColor2;
-				}
-			}
-		}
-		.order-img {
-			width: 146px;
-		}
-	}
-	// 订单详情
-	.order-axis {
-		padding-top: 50px;
-		// 公共
-		/deep/.axis-list {
-			margin-bottom: 50px;
-			.axis-slot-wrap {
-				position: relative;
-				top: -14px;
-				.axis-title {
-					font-size: 30px;
-					font-weight: 600;
-				}
-			}
-			.btn-wrap-com {
-				.admin-button-com {
-					width: 120px;
-					margin-left: 20px;
-					&:first-child {
-						margin-left: 0;
-					}
-				}
-			}
-		}
-		// 首个圆点
-		/deep/.axis-first {
-			.axis-slot-wrap {
-				top: -4px !important;
-			}
-			.node-big {
-				position: absolute;
-				top: 0;
-				left: -20px;
-				transform-origin: 0;
-				transform: translateX(-50%);
-				width: 32px !important;
-				height: 32px !important;
-				border-radius: 50%;
-				background: #fdc3b8;
-			}
-			.node-small {
-				position: absolute;
-				top: 8px;
-				left: 16px;
-				transform-origin: 0;
-				transform: translateX(-50%);
-				background: #f51608;
-				width: 16px !important;
-				height: 16px !important;
-				border-radius: 50%;
-			}
-		}
-	}
+.app-content {
+  background-color: #fff;
+}
+// 公共
+.module-com {
+  padding: 30px;
+  // margin-bottom: 20px;
+}
+// 订单信息
+.order-wrap {
+  @include disFlex(center, space-between);
+  padding: 20px;
+  border-bottom: 20px solid $backColor;
+  .order-det {
+    font-size: 24px;
+    & > div {
+      @include disFlex(center, flex-start);
+      margin-top: 12px;
+      &:first-child {
+        margin-top: 0;
+      }
+      .label {
+        width: 120px;
+        color: $fontColor2;
+      }
+    }
+  }
+  .order-img {
+    width: 146px;
+  }
+}
+// 订单详情
+.order-axis {
+  padding-top: 50px;
+  // 公共
+  /deep/.axis-list {
+    margin-bottom: 50px;
+    .axis-slot-wrap {
+      position: relative;
+      top: -14px;
+      .axis-title {
+        font-size: 30px;
+        font-weight: 600;
+      }
+    }
+    .btn-wrap-com {
+      .admin-button-com {
+        width: 120px;
+        margin-left: 20px;
+        &:first-child {
+          margin-left: 0;
+        }
+      }
+    }
+  }
+  // 首个圆点
+  /deep/.axis-first {
+    .axis-slot-wrap {
+      top: -4px !important;
+    }
+    .node-big {
+      position: absolute;
+      top: 0;
+      left: -20px;
+      transform-origin: 0;
+      transform: translateX(-50%);
+      width: 32px !important;
+      height: 32px !important;
+      border-radius: 50%;
+      background: #fdc3b8;
+    }
+    .node-small {
+      position: absolute;
+      top: 8px;
+      left: 16px;
+      transform-origin: 0;
+      transform: translateX(-50%);
+      background: #f51608;
+      width: 16px !important;
+      height: 16px !important;
+      border-radius: 50%;
+    }
+  }
+}
 </style>

hdApp/src/components/app-bind-info.vue

@@ -47,7 +47,7 @@
         props:{
             nameTetx:{
                 type:String,
-                default:'微信昵称'
+                default:'昵称'
             }
         },
         components:{

hdApp/src/components/app-delivery.vue

@@ -3,8 +3,8 @@
     <!-- 配送公共组件 -->
     <!-- 收花人 -->
     <div class="module-com">
-        <AppBindInfo></AppBindInfo>
-      <!-- <tui-list-cell class="line-cell" :hover="false">
+
+      <tui-list-cell class="line-cell" :hover="false">
         <div class="tui-title">收花人姓名</div>
         <input
           v-model="form.receiveUserName"
@@ -12,53 +12,45 @@
 		      placeholder-style="color:#ccc"
           class="tui-input"
           name="receiveUserName"
-          placeholder="请输入姓名"
+          placeholder="请填写姓名"
         />
-      </tui-list-cell> -->
-      <!-- <tui-list-cell class="line-cell" :hover="false">
-        <div class="tui-title">收花人电话</div>
+      </tui-list-cell>
+
+      <tui-list-cell class="line-cell" :hover="false">
+        <div class="tui-title">收花人手机号</div>
         <input
           v-model="form.receiveMobile"
           placeholder-class="phcolor"
 		      placeholder-style="color:#ccc"
           class="tui-input"
-          name="receiveMobile"
-          placeholder="请输入电话"
           type="number"
+          name="receiveMobile"
+          placeholder="请填写手机号"
         />
-      </tui-list-cell> -->
-      <tui-list-cell class="line-cell code-wrap" :hover="false">
-            <div class="tui-title">取货方式</div>
-            <div>
-              <button class="admin-button-com blue mini-btn">
-                自取
-              </button>
-              <button style="margin-left:10px;" class="admin-button-com default mini-btn">
-                配送
-              </button>
-            </div>
       </tui-list-cell>
+
+
       <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="openAddres">
-        <div class="tui-title">配送城市</div>
+        <div class="tui-title">所在城市</div>
         <div
           class="tui-input"
-          v-if="form.receiveProvince || form.receiveCity"
-        >{{ form.receiveProvince + '-' + form.receiveCity }}</div>
+          v-if="form.province || form.city"
+        >{{ form.province + '-' + form.city }}</div>
         <div class="tui-placeholder" v-else>请选择</div>
       </tui-list-cell>
       <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="selRegionFn">
         <div class="tui-title">详细地址</div>
-        <div class="tui-input" v-if="form.receiveAddress">{{ form.receiveAddress }}</div>
-        <div class="tui-placeholder" v-else>请选择地址</div>
+        <div class="tui-input" v-if="form.address">{{ form.address }}</div>
+        <div class="tui-placeholder" v-else>请填写地址</div>
       </tui-list-cell>
       <tui-list-cell class="line-cell" :hover="false">
         <div class="tui-title">门牌号</div>
         <input
-          v-model="form.receiveFloor"
+          v-model="form.floor"
           placeholder-class="phcolor"
 		      placeholder-style="color:#ccc"
           class="tui-input"
-          name="receiveFloor"
+          name="floor"
           placeholder="楼号门牌号（选填）"
         />
       </tui-list-cell>
@@ -86,73 +78,56 @@
           @click="timeTodaySelFn(2)"
         >晚上</button>
       </div>
+
+
+
       <tui-list-cell class="line-cell" :hover="false">
-        <div class="tui-title">运费</div>
+        <div class="tui-title">订花人姓名</div>
         <input
-          v-model="form.receiveFloor"
+          v-model="form.bookName"
           placeholder-class="phcolor"
 		      placeholder-style="color:#ccc"
           class="tui-input"
-          name="receiveFloor"
-          placeholder="运费(元)"
+          name="bookName"
+          placeholder="请填写姓名（选填）"
         />
       </tui-list-cell>
-    </div>
-    <!-- 订花人 -->
-    <!-- <div class="module-com"> -->
-      <!-- <tui-list-cell class="line-cell" :hover="false">
-        <div class="tui-title">订花人电话</div>
+
+      <tui-list-cell class="line-cell" :hover="false">
+        <div class="tui-title">订花人手机号</div>
         <input
           v-model="form.bookMobile"
           placeholder-class="phcolor"
-		  placeholder-style="color:#ccc"
+		      placeholder-style="color:#ccc"
           class="tui-input"
-          name="bookMobile"
-          placeholder="花送到了通知您（选填）"
           type="number"
+          name="bookMobile"
+          placeholder="请填写手机号（选填）"
         />
-      </tui-list-cell> -->
-      
-      <!-- 具体时间 -->
-     
-    <!-- </div> -->
-    <!-- 贺卡 -->
-    <!-- <div class="module-com gift-wrap input-line-wrap">
+      </tui-list-cell>
+
       <tui-list-cell class="line-cell" :hover="false">
-        <div class="gift-content">
-          <div class="flex-center">
-            <checkbox
-              class="ljd-checkbox"
-              id="needGift"
-              :checked="form.needCard == 1 ? true : false"
-              @change="needCardChange"
-            ></checkbox>
-            <label for="needGift" class="need-gift">需要贺卡</label>
-          </div>
-          <div class="gitf-textarea">
-            <textarea
-              v-model="form.cardInfo"
-              class="tui-textarea"
-              placeholder-class="phcolor"
-			  placeholder-style="color:#ccc"
-              name="cardInfo"
-              placeholder="请填写贺卡内容，留空将寄出空白贺卡"
-              auto-height
-            />
-          </div>
+        <div class="none-name-delivery flex-center" style="padding-left:0rpx;">
+          <div class="tui-title">派送方式</div>
+          <checkbox-group @change="anonymityChange" style="padding-left:70rpx;">
+          <checkbox class="ljd-checkbox" value="1" id="noneNameText" ></checkbox>
+          <label for="noneNameText" class="none-name-text">匿名派送</label>
+          </checkbox-group>
         </div>
       </tui-list-cell>
-    </div> -->
+
+    </div>
     <!-- 备注 -->
     <div class="module-com remark-wrap">
       <tui-list-cell class="line-cell" :hover="false">
-        <div class="tui-title">其它备注</div>
+        <div class="tui-title">备注</div>
         <input
           v-model="form.remark"
           placeholder-class="phcolor"
           class="tui-input"
+          placeholder-style="color:#ccc"
           name="remark"
-          placeholder="（选填）"
+          placeholder="选填"
         />
       </tui-list-cell>
     </div>
@@ -164,7 +139,7 @@
       @onConfirm="onCityConfirm"
     ></simple-address>
     <!-- 选择地区 -->
-    <app-area-sel :show.sync="showRegion" :city="form.receiveCity" @change="changeAreaFn" />
+    <app-area-sel :show.sync="showRegion" :city="form.city" @change="changeAreaFn" />
   </div>
 </template>
 
@@ -172,7 +147,6 @@
 import { mapGetters } from "vuex";
 import TuiListCell from "@/components/plugin/list-cell";
 import AppDatePicker from "@/components/app-date-picker";
-// import AppTextarea from '@/components/app-textarea'
 import SimpleAddress from "@/components/plugin/simple-address";
 import AppAreaSel from "@/components/app-area-sel";
 import AppBindInfo from "@/components/app-bind-info";
@@ -182,16 +156,10 @@ export default {
     AppAreaSel,
     TuiListCell,
     AppDatePicker,
-    // AppTextarea,
     SimpleAddress,
     AppBindInfo
   },
-  props: {
-    // anonymous: {
-    //   type: Boolean,
-    //   default: true
-    // }
-  },
+  props: {},
   data() {
     return {
       region: [],
@@ -199,18 +167,19 @@ export default {
       form: {
         receiveUserName: "", // 收花人姓名；到店自提的姓名
         receiveMobile: "", // 收花人手机；到店自提的电话；
-        receiveProvince: "", // 收花人省份
-        receiveCity: "", // 收花人城市
-        receiveAddress: "", // 收花人城市
-        receiveFloor: "", // 收花人门楼号和牌号
-        receiveFullAddress: "", // 收花人完整地址，从腾讯地图接口获取
-        // bookName: '', // 订花人姓名
+        province: "", // 收花人省份
+        city: "", // 收花人城市
+        address: "", // 收花人城市
+        floor: "", // 收花人门楼号和牌号
+        fullAddress: "", // 收花人完整地址，从腾讯地图接口获取
+        bookName: '', // 订花人姓名
         bookMobile: "", // 订花人手机号
         reachTime: 0, // 配送时间
         reachPeriod: "0", // 配送时段，0上午1下午2晚上
         needCard: "1", // 是否要贺卡 0不要 1要
         cardInfo: "", // 贺卡信息
-        remark: "" // 备注
+        remark: "",// 备注
+        anonymity:0
       },
       region: {
         latitude: 0,
@@ -218,7 +187,6 @@ export default {
       },
       // 省市联动
       cityPickerValueDefault: [0, 0]
-      // pickerText: ''
     };
   },
   computed: {
@@ -227,22 +195,19 @@ export default {
   watch: {
     orderShop(val) {
       console.log("val", val);
-      this.form.receiveProvince = val.shop.province ? val.shop.province : "";
-      this.form.receiveCity = val.shop.city ? val.shop.city : "";
+      this.form.province = val.shop.province ? val.shop.province : "";
+      this.form.city = val.shop.city ? val.shop.city : "";
     }
   },
   mounted() {
     if (!this.$util.isEmpty(this.orderShop)) {
-      this.form.receiveProvince = this.orderShop.shop.province
+      this.form.province = this.orderShop.shop.province
         ? this.orderShop.shop.province
         : "";
-      this.form.receiveCity = this.orderShop.shop.city
+      this.form.city = this.orderShop.shop.city
         ? this.orderShop.shop.city
         : "";
     }
-    // if (this.anonymous) {
-    // this.form.anonymous = "0";
-    // }
   },
   methods: {
     selTimeFn(e) {
@@ -250,47 +215,37 @@ export default {
     },
     // 选择地址
     selRegionFn() {
-      if (!this.form.receiveCity) {
-        this.$msg("请先选择城市！");
+      if (!this.form.city) {
+        this.$msg("请选择城市");
         return false;
       }
       this.showRegion = true;
-      // let that = this
-      // uni.chooseLocation({
-      // 	success: res => {
-      // 		this.form.receiveFullAddress = res.address
-      // 		this.region.latitude = res.latitude
-      // 		this.region.longitude = res.longitude
-      // 	}
-      // })
     },
     changeAreaFn(e) {
       console.log("changeAreaFn", e);
-      this.form.receiveAddress = e.title;
-      this.form.receiveFullAddress = e.address;
+      this.form.address = e.title;
+      this.form.fullAddress = e.address;
       this.region.latitude = e.location.lat;
       this.region.longitude = e.location.lng;
       this.$emit("changeAddress", e);
     },
-    // -----
     timeTodaySelFn(index) {
       this.form.reachPeriod = index;
     },
     needCardChange() {
       this.form.needCard = this.form.needCard == 1 ? 0 : 1;
     },
-    // anonymityChange() {
-    //   this.form.anonymous = this.form.anonymous == 1 ? 0 : 1;
-    // },
+    anonymityChange() {
+      this.form.anonymity = this.form.anonymity == 1 ? 0 : 1;
+    },
     // 省市联动
     openAddres() {
       this.$refs.simpleAddress.open();
     },
     onCityConfirm(e) {
-      this.form.receiveAddress = e.label;
-      this.form.receiveProvince = e.provinceName;
-      this.form.receiveCity = e.cityName;
-      // this.pickerText = JSON.stringify(e)
+      this.form.address = e.label;
+      this.form.province = e.provinceName;
+      this.form.city = e.cityName;
     }
   }
 };