Merge branch 'master' of git.huaml.com:zhh/front-end

ghs/src/admin/order/components/card-name.vue

@@ -1,50 +0,0 @@
-<template>
-	<div class="card-name-module">
-        <div class="app-size-30 app-color-0">{{ info.receiveUserName }}</div>
-        <div>{{ info.receiveMobile }}</div>
-        <div>{{ info.receiveAddress }}</div>
-        <div class="card-tag">
-            <img :src="`${constant.imgUrl}/retail/order/tag.png`" alt="" mode="widthFix" >
-        </div>
-    </div>
-</template>
-
-<script>
-export default {
-	name: 'card-name-module',
-	props: {
-		info: {
-			type: Object,
-			default: () => {}
-		}
-	},
-	data() {
-		return {
-			constant: this.$constant
-		}
-	}
-}
-</script>
-
-<style lang="scss" scoped>
-.card-name-module {
-    position: relative;
-    color: $fontColor3;
-    box-shadow: 0 0 10px #ccc;
-    border-radius: 4px;
-    padding: 24px 0 24px 20px;
-    & > div {
-        margin-top: 14px;
-        &:first-child {
-            margin-top: 0;
-        }
-    }
-    .card-tag {
-        position: absolute;
-        top: 0;
-        right: 0;
-        width: 100px;
-        margin-top: 0;
-    }
-}
-</style>

ghs/src/admin/order/components/sel-confirm.vue

@@ -1,290 +0,0 @@
-<template>
-	<div class="sel-confirm-module">
-		<!-- 列表 -->
-		<time-axis v-if="!$util.isEmpty(orderComData)">
-			<!-- 完成 -->
-			<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" @click="confirmFn">订单归类</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">{{ orderComData[1].actionName }}1111</div>
-						<div class="axis-det">
-							<div class="app-color-0 app-bold">{{ orderComData[1].addTime | formatTime }}</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">{{ orderComData[2].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>配送方：{{ orderComData[2].sendInfo.sideName }}</div>
-								<div>距离：{{ orderComData[2].sendInfo.distance }}km</div>
-								<div>运费：¥{{ orderComData[2].sendInfo.cost }}</div>
-								<div>小费：¥{{ orderComData[2].sendInfo.tip }}</div>
-								<div>
-									<span>状态：</span>
-									<span class="app-color-4">{{ orderComData[2].sendInfo.status | constantfilter('SEND_STATUS') }}</span>
-								</div>
-							</block>
-							<block v-else>
-								<div>配送：门店</div>
-							</block>
-						</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">{{ orderComData[3].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" />
-							<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="mobilePrintFn" >重打</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">{{ orderComData[4].actionName }}</div>
-						<div class="axis-det">
-							<div class="app-color-0 app-bold">{{ orderComData[4].addTime | formatTime }}</div>
-						</div>
-					</div>
-				</template>
-			</timeaxis-item>
-		</time-axis>
-		<!-- 选取分类 -->
-		<modal-module :show="selModal" :maskClosable="false" @cancel="modalCancel" @click="selModalClick" title="订单归类" padding="30rpx 30rpx">
-			<template v-slot:content>
-				<div class="upload-confirm-wrap">
-					<!-- 选择分类 -->
-					<div class="sel-wrap">
-						<div class="sel-tit">选择分类</div>
-						<div class="sel-btn">
-							<block v-for="(item, index) in categoryData" :key="index">
-								<button class="admin-button-com" :class="[form.categoryId == item.id ? '' : 'default']" @click="selCategoryFn(item)">{{ item.categoryName || '暂无' }}</button>
-							</block>
-						</div>
-					</div>
-					<!-- 选择用途 -->
-					<div class="sel-wrap">
-						<div class="sel-tit">选择用途</div>
-						<div class="sel-btn">
-							<block v-for="(item, index) in usageData" :key="index">
-								<button class="admin-button-com" :class="[form.usageId == item.id ? '' : 'default']" @click="selUsageFn(item)">{{ item.usageName || '暂无' }}</button>
-							</block>
-						</div>
-					</div>
-				</div>
-			</template>
-		</modal-module>
-	</div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import TimeAxis from '@/admin/home/components/plugin/time-axis'
-import TimeaxisItem from '@/admin/home/components/plugin/timeaxis-item'
-import ModalModule from '@/components/plugin/modal'
-import CardName from './card-name'
-// api
-import { getCategory, getUsage } from '@/utils/config'
-import { orderClass } from '@/api/order'
-export default {
-	name: 'sel-confirm-module',
-	components: {
-		TimeAxis,
-		TimeaxisItem,
-		ModalModule,
-		CardName
-	},
-	props: {
-		query: {
-			type: Object,
-			default: () => {}
-		},
-		orderData: {
-			type: Object,
-			default: () => {}
-		},
-		orderComData: {
-			type: Array,
-			default: () => []
-		}
-	},
-	data() {
-		return {
-			selModal: false,
-			form: {
-				categoryId: '',
-				usageId: ''
-			}
-		}
-	},
-	computed: {
-		...mapGetters({ categoryData: 'getCategory' }),
-		...mapGetters({ usageData: 'getUsage' })
-	},
-	mounted() {
-		getCategory()
-		getUsage()
-	},
-	methods: {
-		confirmFn() {
-			this.selModal = true
-		},
-		// modal
-		// 操作
-		selCategoryFn(item) {
-			this.form.categoryId = item.id
-		},
-		selUsageFn(item) {
-			this.form.usageId = item.id
-		},
-		selModalClick(e) {
-			if (e.index === 0) {
-				this.modalCancel()
-			} else {
-				orderClass({
-					id: this.orderData.id,
-					...this.form
-				}).then(res => {
-					this.$msg('订单归类成功！')
-					setTimeout(() => {
-						this.$emit('nextPageSuccess', {
-						id: this.query.id,
-						pageStatus: 6
-					})
-						// this.$util.pageTo({
-						// 	url: '/admin/order/ship',
-						// 	query: {
-						// 		id: this.query.id,
-						// 		pageStatus: 6
-						// 	}
-						// })
-					}, 1000)
-				})
-			}
-		},
-		modalCancel() {
-			this.selModal = false
-		},
-		mobilePrintFn(){
-		    this.$msg('此功能即将开通')
-		}
-	}
-}
-</script>
-
-<style lang="scss" scoped>
-	// 完成
-	.axis-first {
-		.axis-det {
-			margin-top: 40px !important;
-		}
-		.confirm-btn {
-			width: 100%;
-		}
-	}
-	// 发货
-	.confirm-wrap {
-		.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;
-				}
-			}
-		}
-	}
-	// 弹窗
-	.upload-confirm-wrap {
-		max-height: 600px;
-		overflow-y: auto;
-		.modal-tit {
-			@include disFlex(center, center);
-			font-size: 40px;
-			margin-top: 30px;
-			margin-bottom: 50px;
-			.iconfont {
-				color: #09bb07;
-				margin-right: 20px;
-				font-size: 50px;
-			}
-		}
-		//  分类
-		.sel-wrap {
-			color: $fontColor2;
-			font-size: 32px;
-			.sel-tit {
-				text-align: left;
-			}
-			.sel-btn {
-				@include disFlex(center, flex-start);
-				flex-wrap: wrap;
-				padding: 10px 0 40px;
-				.admin-button-com {
-					// width: 170px;
-					margin-right: 20px;
-					margin-top: 20px;
-					padding-top: 16px;
-					padding-bottom: 16px;
-					border-radius: 4px;
-					// &:nth-child(3n + 1) {
-					// 	margin-left: 0;
-					// }
-				}
-			}
-		}
-	}
-</style>

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

@@ -1,225 +0,0 @@
-<template>
-  <div class="sel-confirm-module">
-    <!-- 列表 -->
-    <time-axis v-if="!$util.isEmpty(orderComData)">
-      <!-- 送达 -->
-      <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 blue" @click="askConfirmReachFn">确认</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">{{ orderComData[1].actionName }}</div>
-            <div class="axis-det">
-              <div class="app-color-0 app-bold">{{ orderComData[1].addTime | formatTime }}</div>
-              <block v-if="!$util.isEmpty(orderComData[1].sendInfo)">
-                <div>配送方：{{ orderComData[1].sendInfo.sideName }}</div>
-                <div>距离：{{ orderComData[1].sendInfo.distance }}km</div>
-                <div>运费：¥{{ orderComData[1].sendInfo.cost }}</div>
-                <div>小费：¥{{ orderComData[1].sendInfo.tip }}</div>
-                <div>
-                  <span>状态：</span>
-                  <span
-                    class="app-color-4"
-                  >{{ orderComData[1].sendInfo.status | constantfilter('SEND_STATUS') }}</span>
-                </div>
-              </block>
-              <block v-else>
-                <div>配送：门店</div>
-              </block>
-            </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">{{ orderComData[2].actionName }}</div>
-            <div class="axis-det">
-              <div class="app-bold">{{ orderComData[2].finishTime | formatTime }}</div>
-              <block v-if="!$util.isEmpty(orderComData[2].receive)">
-                <card-name :info="orderComData[2].receive" />
-              </block>
-              <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>
-      </timeaxis-item>
-      <!-- 下单 -->
-      <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-det">
-              <div class="app-color-0 app-bold">{{ orderComData[3].finishTime | formatTime }}</div>
-            </div>
-          </div>
-        </template>
-      </timeaxis-item>
-    </time-axis>
-    <modal-module
-      :show="showManualConfirmModal"
-      @cancel="cancelConfirmReachFn"
-      @click="manualConfirmReachFn"
-      content="此订单由快递配送，送到会自动确认，确定要手动确认？"
-      color="#333"
-      :size="32"
-      padding="30rpx 30rpx"
-    ></modal-module>
-  </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 ModalModule from "@/components/plugin/modal";
-// api
-import { orderReach } from "@/api/order";
-export default {
-  name: "sel-confirm-module",
-  components: {
-    TimeAxis,
-    TimeaxisItem,
-    CardName,
-    ModalModule
-  },
-  props: {
-    query: {
-      type: Object,
-      default: () => {}
-    },
-    orderData: {
-      type: Object,
-      default: () => {}
-    },
-    orderComData: {
-      type: Array,
-      default: () => []
-    }
-  },
-  data() {
-    return {
-      showManualConfirmModal: false
-    };
-  },
-  methods: {
-    confirmReachFn() {
-      orderReach({
-        id: this.orderData.id,
-        option: 1
-      }).then(res => {
-        this.$msg("已确认");
-        this.$emit("nextPageSuccess", {
-          id: this.query.id,
-          pageStatus: 5
-        });
-        // setTimeout(() => {
-        // 	this.$util.pageTo({
-        // 		url: '/admin/order/ship',
-        // 		query: {
-        // 			id: this.query.id,
-        // 			pageStatus: 5
-        // 		}
-        // 	})
-        // }, 1000)
-      });
-    },
-    askConfirmReachFn() {
-      if (this.orderData.sendType == 3) {
-        this.showManualConfirmModal = true;
-      } else {
-        this.confirmReachFn();
-      }
-    },
-    manualConfirmReachFn(e) {
-      if (e.index === 0) {
-        this.cancelConfirmReachFn();
-      } else {
-        this.confirmReachFn();
-      }
-    },
-    cancelConfirmReachFn() {
-      this.showManualConfirmModal = false;
-    },
-    mobilePrintFn() {
-      this.$msg("此功能即将开通");
-    },
-    printerSetFn() {
-      this.$util.pageTo({
-        url: "/admin/order/print"
-      });
-    }
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-// 发货
-.confirm-wrap {
-  .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>

ghs/src/admin/order/components/sel-mention.vue

@@ -1,130 +0,0 @@
-<template>
-	<div class="sel-mention-module">
-		<!-- 列表 -->
-		<time-axis>
-			<!-- 完成 -->
-			<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">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>2019-10-10 18:00:00</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>2019-10-10 18:00:00</div>
-                            <div class="app-color-2">自己送</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>2019-10-10 18:00:00</div>
-                            <div class="app-color-2">免制单</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>2019-10-10 18:00:00</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'
-export default {
-	name: 'sel-mention-module',
-	components: {
-		TimeAxis,
-		TimeaxisItem
-	},
-	props: {
-		query: {
-			type: Object,
-			default: () => {}
-		},
-		orderData: {
-			type: Object,
-			default: () => {}
-		},
-		orderComData: {
-			type: Array,
-			default: () => []
-		}
-	}
-}
-</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;
-                }
-            }
-		}
-    }
-	// 制单
-	.com-wrap {
-		.axis-det {
-			margin-top: 14px;
-            & > div {
-                margin-top: 10px;
-                &:first-child {
-                    margin-top: 0;
-                }
-            }
-		}
-	}
-</style>

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

@@ -1,114 +0,0 @@
-<template>
-	<div class="sel-order-module">
-		<!-- 列表 -->
-		<time-axis>
-			<!-- 制单 -->
-			<timeaxis-item class="axis-list axis-first print-order" 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" @click="hasSendOrderFn">跳过</button>
-							<button class="admin-button-com big blue" @click="pageTo({
-						url: '/admin/order/fill-form',
-						query: {
-							id: orderData.id
-						}
-							})">填写</button>
-						</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">下单</div>
-						<div class="axis-det">
-							<div>{{ orderData.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'
-// api
-import { printOrder } from '@/api/order'
-export default {
-	name: 'sel-order-module',
-	components: {
-		TimeAxis,
-		TimeaxisItem
-	},
-	props: {
-		query: {
-			type: Object,
-			default: () => {}
-		},
-		orderData: {
-			type: Object,
-			default: () => {}
-		}
-	},
-	data() {
-		return {
-			data: {}
-		}
-	},
-	mounted() {
-	},
-	methods: {
-		hasSendOrderFn() {
-			printOrder({
-				id: this.orderData.id,
-				option: 1
-			}).then(res => {
-				this.$emit('nextPageSuccess', {
-					id: this.orderData.id,
-					pageStatus: 7
-					})
-				// this.$util.pageTo({
-				// 	url: '/admin/order/ship',
-				// 	query: {
-				// 		id: this.orderData.id,
-				// 		pageStatus: 7
-				// 	}
-				// })
-			})
-		}
-	}
-}
-</script>
-
-<style lang="scss" scoped>
-	// 制单
-	.print-order {
-		.axis-slot-wrap {
-			top: -4px !important;
-		}
-		.axis-det {
-			@include disFlex(center, space-between);
-			margin-top: 50px;
-			margin-bottom: 10px;
-			.admin-button-com {
-				width: 48%;
-			}
-		}
-	}
-	// 下单
-	.down-order {
-		.axis-det {
-			margin-top: 14px;
-		}
-	}
-</style>

ghs/src/admin/order/components/sel-pending-order.vue

@@ -1,129 +0,0 @@
-<template>
-	<div class="sel-pending-order-module">
-		<!-- 列表 -->
-		<time-axis>
-			<!-- 发货 -->
-			<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">{{ orderComData[0].actionName }}</div>
-						<div class="axis-det">
-							<div>配送方：{{ orderComData[0].sendInfo.sideName }}</div>
-                            <div>距离：{{ orderComData[0].sendInfo.distance }}km</div>
-                            <div>运费：¥{{ orderComData[0].sendInfo.cost }}</div>
-                            <div>
-                                <span>小费：¥{{ orderComData[0].sendInfo.tip }}</span>
-                                <i class="iconfont iconbianjijiage1 modify-btn"></i>
-                            </div>
-                            <div>
-								<span>状态：</span>
-								<span class="app-price">{{ orderComData[0].sendInfo.status | constantfilter('SEND_STATUS') }}</span>
-							</div>
-                            <div>期待送花时间：{{ orderComData[2].addTime | formatTime }}</div>
-                            <div class="admin-button-com default">取消</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>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>
-                                <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>2019-10-10 18:00:00</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'
-export default {
-	name: 'sel-pending-order-module',
-	components: {
-		TimeAxis,
-		TimeaxisItem,
-		CardName
-	},
-	props: {
-		query: {
-			type: Object,
-			default: () => {}
-		},
-		orderData: {
-			type: Object,
-			default: () => {}
-		},
-		orderComData: {
-			type: Array,
-			default: () => []
-		}
-	}
-}
-</script>
-
-<style lang="scss" scoped>
-    // 发货
-    .confirm-wrap {
-		.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;
-                }
-            }
-		}
-	}
-</style>

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

@@ -1,286 +0,0 @@
-<template>
-  <div class="sel-ship-confirm-module">
-    <!-- 列表 -->
-    <time-axis v-if="!$util.isEmpty(orderComData)">
-      <!-- 完成 -->
-      <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">{{ orderComData[0].actionName }}</div>
-            <div class="axis-det">
-              <div class="app-color-0 app-bold">{{ orderComData[0].finishTime | formatTime }}</div>
-              <template v-if="$util.isEmpty(orderComData[0].classify)">
-              <button class="admin-button-com small blue confirm-btn" @click="confirmFn">分类</button>
-              </template>
-              <template v-else>
-              <div>{{ orderComData[0].classify.usage }}  {{ orderComData[0].classify.category }}</div>
-              </template>
-            </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">{{ orderComData[1].actionName}}</div>
-            <div class="axis-det">
-              <div class="app-color-0 app-bold">{{ orderComData[1].addTime | formatTime }}</div>
-              <block v-if="!$util.isEmpty(orderComData[1].sendInfo)">
-                <div>配送：{{ orderComData[1].sendInfo.sideName }}</div>
-                <div>距离：{{ orderComData[1].sendInfo.distance }}km</div>
-                <div>运费：¥{{ orderComData[1].sendInfo.cost }}</div>
-                <div>小费：¥{{ orderComData[1].sendInfo.tip }}</div>
-                <div>状态：{{ orderComData[1].sendInfo.status | constantfilter('SEND_STATUS') }}</div>
-              </block>
-              <block v-else>
-                <div>配送：门店</div>
-              </block>
-            </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">{{ orderComData[2].actionName}}</div>
-            <div class="axis-det">
-              <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" 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>
-      </timeaxis-item>
-      <!-- 下单 -->
-      <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-det">
-              <div class="app-bold">{{ orderComData[3].addTime | formatTime }}</div>
-            </div>
-          </div>
-        </template>
-      </timeaxis-item>
-    </time-axis>
-
-		<!-- 选取分类 -->
-		<modal-module :show="selModal" :maskClosable="false" @cancel="modalCancel" @click="selModalClick" title="订单归类" padding="30rpx 30rpx">
-			<template v-slot:content>
-				<div class="upload-confirm-wrap">
-					<!-- 选择分类 -->
-					<div class="sel-wrap">
-						<div class="sel-tit">类型</div>
-						<div class="sel-btn">
-							<block v-for="(item, index) in categoryData" :key="index">
-								<button class="admin-button-com" :class="[form.categoryId == item.id ? '' : 'default']" @click="selCategoryFn(item)">{{ item.categoryName || '暂无' }}</button>
-							</block>
-						</div>
-					</div>
-					<!-- 选择用途 -->
-					<div class="sel-wrap">
-						<div class="sel-tit">用途</div>
-						<div class="sel-btn">
-							<block v-for="(item, index) in usageData" :key="index">
-								<button class="admin-button-com" :class="[form.usageId == item.id ? '' : 'default']" @click="selUsageFn(item)">{{ item.usageName || '暂无' }}</button>
-							</block>
-						</div>
-					</div>
-				</div>
-			</template>
-		</modal-module>
-
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import TimeAxis from "@/admin/home/components/plugin/time-axis";
-import TimeaxisItem from "@/admin/home/components/plugin/timeaxis-item";
-import { getCategory, getUsage } from '@/utils/config'
-import { orderClass } from '@/api/order'
-import ModalModule from '@/components/plugin/modal'
-import CardName from "./card-name";
-export default {
-  name: "sel-ship-confirm-module",
-  components: {
-    TimeAxis,
-    TimeaxisItem,
-    CardName,
-    ModalModule
-  },
-  props: {
-    query: {
-      type: Object,
-      default: () => {}
-    },
-    orderData: {
-      type: Object,
-      default: () => {}
-    },
-    orderComData: {
-      type: Array,
-      default: () => []
-    }
-  },
-	data() {
-		return {
-			selModal: false,
-			form: {
-				categoryId: '',
-				usageId: ''
-			}
-		}
-	},
-	computed: {
-		...mapGetters({ categoryData: 'getCategory' }),
-		...mapGetters({ usageData: 'getUsage' })
-  },
-	mounted() {
-		getCategory()
-		getUsage()
-	},
-  methods: {
-    printerSetFn() {
-      this.$util.pageTo({
-        url: "/admin/order/print"
-      });
-    },
-		confirmFn() {
-			this.selModal = true
-		},
-		// modal
-		// 操作
-		selCategoryFn(item) {
-			this.form.categoryId = item.id
-		},
-		selUsageFn(item) {
-			this.form.usageId = item.id
-		},
-		selModalClick(e) {
-			if (e.index === 0) {
-				this.modalCancel()
-			} else {
-				orderClass({
-					id: this.orderData.id,
-					...this.form
-				}).then(res => {
-          this.selModal = false;
-					this.$msg('订单归类成功！')
-					setTimeout(() => {
-						this.$emit('nextPageSuccess', {
-						id: this.query.id,
-						pageStatus: 6
-					})
-						// this.$util.pageTo({
-						// 	url: '/admin/order/ship',
-						// 	query: {
-						// 		id: this.query.id,
-						// 		pageStatus: 6
-						// 	}
-						// })
-					}, 1000)
-				})
-			}
-    },
-    modalCancel() {
-			this.selModal = false
-		},
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-// 发货
-.confirm-wrap {
-  .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;
-      }
-    }
-  }
-}
-	// 弹窗
-	.upload-confirm-wrap {
-		max-height: 600px;
-		overflow-y: auto;
-		.modal-tit {
-			@include disFlex(center, center);
-			font-size: 40px;
-			margin-top: 30px;
-			margin-bottom: 50px;
-			.iconfont {
-				color: #09bb07;
-				margin-right: 20px;
-				font-size: 50px;
-			}
-		}
-		//  分类
-		.sel-wrap {
-			color: $fontColor2;
-			font-size: 32px;
-			.sel-tit {
-				text-align: left;
-			}
-			.sel-btn {
-				@include disFlex(center, flex-start);
-				flex-wrap: wrap;
-				padding: 10px 0 40px;
-				.admin-button-com {
-					// width: 170px;
-					margin-right: 20px;
-					margin-top: 20px;
-					padding-top: 16px;
-					padding-bottom: 16px;
-					border-radius: 4px;
-					// &:nth-child(3n + 1) {
-					// 	margin-left: 0;
-					// }
-				}
-			}
-		}
-	}
-</style>
-

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

@@ -1,311 +0,0 @@
-<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 v-if="orderData.hasDeliver == 1" class="axis-det btn-wrap">
-              <button class="admin-button-com big blue confirm-btn" @click="sendSelfFn(1)">确认</button>
-            </div>
-            <div v-else class="axis-det btn-wrap" style="margin-bottom:16px;">
-              <button
-                class="admin-button-com big blue confirm-btn"
-                @click="sendSelfFn(0)"
-                style="margin:auto;"
-              >自己送</button>
-              <button
-                class="admin-button-com big blue confirm-btn"
-                @click="sendShipFn"
-                style="margin:auto;"
-              >代送</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">{{ orderComData[1].addTime | formatTime }}</div>
-              <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>
-                </div>
-              </block>
-            </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">{{ orderComData[1].addTime | formatTime }}</div>
-            </div>
-          </div>
-        </template>
-      </timeaxis-item>
-    </time-axis>
-    <!-- ship -->
-    <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">
-            <div class="line-label">送花时间</div>
-            <div class="line-input">
-              <picker
-                mode="multiSelector"
-                :range="timeList"
-                :value="timeValue"
-                @change="changeTimeFn"
-                class="inp-select"
-              >
-                <div v-if="form.sendTime">{{ form.sendTime }}</div>
-                <div class="tui-placeholder" v-else>请选择</div>
-              </picker>
-            </div>
-          </div>
-          <div class="inp-list-line">
-            <div class="line-label">配送方</div>
-            <div class="line-input">
-              <picker
-                mode="selector"
-                :range="deliveryList"
-                @change="changeDeliveryFn"
-                range-key="text"
-                class="inp-select"
-              >
-                <div v-if="form.sendSide">{{ sendSideText }}</div>
-                <div class="tui-placeholder" v-else>请选择</div>
-              </picker>
-            </div>
-          </div>
-        </div>
-      </template>
-    </modal-module>
-    <!-- 删除提示 -->
-    <modal-module
-      :show="selfShipModal"
-      @cancel="modalCancel"
-      @click="shipModalClick"
-      :content="selfShipHint"
-      color="#333"
-      :size="32"
-      padding="30rpx 30rpx"
-    ></modal-module>
-  </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 ModalModule from "@/components/plugin/modal";
-// api
-import { orderSend, printOrder } from "@/api/order";
-export default {
-  name: "sel-confirm-module",
-  components: {
-    TimeAxis,
-    TimeaxisItem,
-    CardName,
-    ModalModule
-  },
-  props: {
-    query: {
-      type: Object,
-      default: () => {}
-    },
-    orderData: {
-      type: Object,
-      default: () => {}
-    },
-    orderComData: {
-      type: Array,
-      default: () => []
-    }
-  },
-  data() {
-    return {
-      shipModal: false,
-      form: {
-        sendType: 0,
-        sendTime: "",
-        sendSide: 1
-      },
-      sendSideText: "达达配送",
-      timeList: [
-        [
-          "1",
-          "2",
-          "3",
-          "4",
-          "5",
-          "6",
-          "7",
-          "8",
-          "9",
-          "10",
-          "11",
-          "12",
-          "13",
-          "14",
-          "15",
-          "16",
-          "17",
-          "18",
-          "19",
-          "20",
-          "21",
-          "22",
-          "23",
-          "24"
-        ],
-        ["00", "10", "20", "30", "40", "50"]
-      ],
-      timeValue: [0, 0],
-      deliveryList: [
-        {
-          text: "达达配送",
-          key: 1
-        }
-      ],
-      // 自己送
-      selfShipModal: false,
-      selfShipHint: ""
-    };
-  },
-  methods: {
-    sendShipFn() {
-      this.shipModal = true;
-      this.sendSideText = "达达配送";
-      this.form = {
-        sendType: 3,
-        sendTime: "",
-        sendSide: 1
-      };
-    },
-    sendSelfFn(num) {
-      if (num == 0) {
-        this.selfShipHint = "确认自己送？";
-      } else {
-        this.selfShipHint = "确认发货？";
-      }
-      this.selfShipModal = true;
-      this.form = {
-        sendType: 2,
-        sendTime: "",
-        sendSide: ""
-      };
-    },
-    printOrderFn() {
-      printOrder({
-        id: this.orderData.id,
-        option: 1
-      }).then(res => {
-        this.$emit("nextPageSuccess", {
-          id: this.orderData.id,
-          pageStatus: 7
-        });
-      });
-    },
-    switchChangeFn(e) {
-      this.form.sendType = e.detail.value ? 1 : 0;
-    },
-    changeTimeFn(e) {
-      let oneIndex = e.detail.value[0] || 0;
-      let twoIndex = e.detail.value[1] || 0;
-      this.form.sendTime =
-        this.timeList[0][oneIndex] + ":" + this.timeList[1][twoIndex];
-    },
-    changeDeliveryFn(e) {
-      this.form.sendSide = this.deliveryList[e.detail.value].key;
-      this.sendSideText = this.deliveryList[e.detail.value].text;
-    },
-    shipModalClick(e) {
-      if (e.index === 0) {
-        this.modalCancel();
-      } else {
-        orderSend({
-          id: this.query.id,
-          option: 1,
-          ...this.form
-        }).then(res => {
-          this.$emit("nextPageSuccess", {
-            id: this.query.id,
-            pageStatus: 3
-          });
-          this.modalCancel();
-        });
-      }
-    },
-    modalCancel() {
-      this.shipModal = false;
-      this.selfShipModal = false;
-    },
-    mobilePrintFn() {
-      this.$msg("即将开通...");
-    },
-    printerSetFn() {
-      this.$util.pageTo({
-        url: "/admin/order/print"
-      });
-    }
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-// 完成
-.axis-first {
-  .axis-det {
-    margin-top: 40px !important;
-  }
-  .confirm-btn {
-    width: 40%;
-  }
-}
-// 制单
-.com-wrap {
-  .axis-det {
-    margin-top: 14px;
-    & > div {
-      margin-top: 20px;
-      &:first-child {
-        margin-top: 0;
-      }
-    }
-  }
-}
-// modal
-.ship-modal {
-  .line-label {
-    width: 140px;
-  }
-}
-.btn-wrap {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-</style>

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

@@ -1,138 +0,0 @@
-<template>
-  <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>
-					</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">自己送</button>
-							<button class="admin-button-com big blue">快递送</button>
-						</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" @click="printOrderFn">打印</button>
-                <button class="admin-button-com default" @click="modifyPrintFn">修改</button>
-                <button class="admin-button-com default" @click="printerSetFn">打印机</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";
-// api
-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.$emit('nextPageSuccess', {
-           id: this.orderData.id,
-            pageStatus: 7
-        })
-      });
-    },
-    printerSetFn() {
-        this.$util.pageTo({
-          url: "/admin/order/print"
-        });
-    },
-    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%;
-    }
-  }
-}
-// 制单
-.print-order {
-  .axis-det {
-    margin-top: 14px;
-    & > div {
-      margin-top: 20px;
-      &:first-child {
-        margin-top: 0;
-      }
-    }
-  }
-}
-// 下单
-.down-order {
-  .axis-det {
-    margin-top: 14px;
-  }
-}
-</style>

ghs/src/admin/order/detail.vue

@@ -1,416 +0,0 @@
-<template>
-  <div class="app-content">
-    <div class="page-top">
-      <div class="page-top-img">
-        <img :src="`${constant.imgUrl}/retail/order/bg.png`" mode="widthFix" />
-      </div>
-      <div class="page-top-det">
-        <div>
-          <div class="page-status">{{ data.status | constantfilter('ORDER_STATUS') }}</div>
-          <!-- <div class="page-prompt">请尽快支付哟~</div> -->
-        </div>
-        <div class="page-status-img">
-          <img :src="data.status == 0 ? waitPayImg : waitDeliveryImg" mode="widthFix" />
-        </div>
-      </div>
-    </div>
-    <!-- 订单详情 -->
-    <div class="page-det">
-      <!-- 商品信息 -->
-      <div class="module-com">
-        <div class="module-tit">商品信息</div>
-        <div class="module-det">
-          <block v-if="!$util.isEmpty(data.goodsInfoList)">
-            <list-module
-              v-for="(items, subIndex) in data.goodsInfoList"
-              :key="subIndex"
-              :info="items"
-            />
-          </block>
-        </div>
-      </div>
-      <!-- 订单信息 -->
-      <div class="module-com order-msg">
-        <div class="module-tit">订单信息</div>
-        <div class="module-det">
-          <!--  -->
-          <div class="order-msg-blo">
-            <div class="msg-list">
-              <div class="label">收花人</div>
-              <div class="value">{{ data.receiveUserName }}</div>
-            </div>
-            <div class="msg-list">
-              <div class="label">电话</div>
-              <div class="value">{{ data.receiveMobile }}</div>
-            </div>
-            <div class="msg-list">
-              <div class="label">地址</div>
-              <div class="value">{{ data.receiveFullAddress }}</div>
-            </div>
-          </div>
-          <!--  -->
-          <div class="order-msg-blo">
-            <div class="msg-list">
-              <div class="label">送达时间</div>
-              <div class="value">{{ data.reachDate || '暂无' }}</div>
-            </div>
-            <div class="msg-list">
-              <div class="label">贺卡</div>
-              <div class="value">{{ data.needCard == 1 ? "需要" : '不需要' }}</div>
-            </div>
-            <div class="msg-list">
-              <div class="label">祝福语</div>
-              <div class="value">{{ data.cardInfo || '暂无' }}</div>
-            </div>
-          </div>
-          <!--  -->
-          <!-- <div class="order-msg-blo">
-						<div class="msg-list">
-							<div class="label">订花人</div>
-							<div class="value">{{ data.bookName }}</div>
-						</div>
-						<div class="msg-list">
-							<div class="label">微信</div>
-							<div class="value">{{ data.bookName }}</div>
-						</div>
-						<div class="msg-list">
-							<div class="label">手机</div>
-							<div class="value">{{ data.bookMobile }}</div>
-						</div>
-          </div>-->
-          <!--  -->
-          <div class="order-msg-blo">
-            <div class="msg-list">
-              <div class="label">客户评分</div>
-              <div class="value">
-                <!-- <span>{{ data.totalFlow }}</span> -->
-                <rate-module :current="Number(data.totalFlow) || 0" :disabled="true"></rate-module>
-              </div>
-            </div>
-            <div class="msg-list">
-              <div class="label">客户留言</div>
-              <div class="value">{{ data.evaluate || '暂无' }}</div>
-            </div>
-          </div>
-          <!--  -->
-          <div class="order-msg-blo">
-            <div class="msg-list">
-              <div class="label">订单号</div>
-              <div class="value">{{ data.orderSn }}</div>
-            </div>
-            <div class="msg-list">
-              <div class="label">时间</div>
-              <div class="value">{{ data.addTime | formatTime }}</div>
-            </div>
-            <div class="msg-list">
-              <div class="label">总价</div>
-              <div class="value">￥{{ data.prePrice }}</div>
-            </div>
-            <div class="msg-list">
-              <div class="label">运费</div>
-              <div class="value">￥{{ data.sendCost }}</div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <!-- 优惠信息 -->
-      <div
-        class="module-com coupon-wrap"
-        v-if="data.discountAmount && data.discountAmount != '0.00'"
-      >
-        <div class="module-det flex-center-between">
-          <div
-            class="app-color-3"
-          >
-
-          <template v-if="data.discountType == 0">未知</template>
-          <template v-else-if="data.discountType == 1">优惠券</template>
-          <template v-else-if="data.discountType == 2">会员优惠</template>
-          <template v-else-if="data.discountType == 3">随机优惠</template>
-          <template v-else>未知</template>
-
-          </div>
-          <div class="app-price">-￥{{ data.discountAmount }}</div>
-        </div>
-      </div>
-    </div>
-    <!-- 按钮 -->
-    <div class="page-btn app-footer">
-      <div class="flex-center">
-        <span v-if="data.status == 0">应付款</span>
-        <span v-else-if="data.status == 6">已退款</span>
-        <span v-else>已付款</span>
-        <span class="app-price">
-          <span>￥</span>
-          <span class="app-size-40">{{ data.actPrice }}</span>
-        </span>
-      </div>
-      <template>
-        <!--
-				<button class="admin-button-com middle" @click="updatePriceFn">修改价格</button>
-        -->
-      </template>
-      <template>
-        <div class="operate-btn-wrap">
-          <block v-if="data.status == 0">
-            <button class="admin-button-com middle" style="color: #666666;border-color: #dddddd;">自取</button>
-            <button class="admin-button-com middle" style="color: #666666;border-color: #dddddd;">发货</button>
-          </block>
-          <block v-else-if="data.status == 4"></block>
-          <block v-else-if="data.status == 6"></block>
-          <block v-else-if="data.status == 5">
-            <button
-              v-if="data.sendType != 1"
-              class="admin-button-com default"
-              @click="seeSendFn"
-            >配送详情</button>
-          </block>
-          <block v-else>
-            <button v-if="data.currentFlow == 1" class="admin-button-com middle" @click.stop="freeShippingFn">自取</button>
-            <button
-              class="admin-button-com middle"
-              @click.stop="pageTo({
-              url: '/admin/order/ship',
-              query: {
-                id: data.id,
-                pageStatus: 0
-              }
-            })"
-            >发货</button>
-          </block>
-        </div>
-      </template>
-      <!-- <template v-if="data.status == 5">
-				<button class="admin-button-com middle">退款</button>
-      </template>-->
-    </div>
-    <!-- 修改价格 -->
-    <modal-module
-      :show="updatePriceModal"
-      @cancel="modalCancel"
-      @click="updateModalClick"
-      title="修改价格"
-      padding="30rpx 30rpx"
-    >
-      <template v-slot:content>
-        <div class="app-modal-input-wrap">
-          <div class="inp-list-line required">
-            <!-- <div class="line-label">角色名称</div> -->
-            <div class="line-input">
-              <input
-                v-model="form.price"
-                type="text"
-                :adjust-position="false"
-                class="inp-input"
-                placeholder="请输入价格"
-              />
-            </div>
-          </div>
-        </div>
-      </template>
-    </modal-module>
-    <!-- 免发货弹窗 -->
-    <modal-module
-      :show="freeShipModal"
-      @cancel="modalCancel"
-      @click="freeShipModalClick"
-      content="确认客户已自取？"
-      color="#333"
-      :size="32"
-      padding="30rpx 30rpx"
-    ></modal-module>
-  </div>
-</template>
-
-<script>
-import ListModule from "@/components/module/app-order-list";
-import AppCoupon from "@/components/app-coupon-sel";
-import ModalModule from "@/components/plugin/modal";
-import RateModule from "@/components/plugin/rate";
-// api
-import { getDetB, freeShipping, orderUpdatePrice } from "@/api/order";
-export default {
-  name: "order-detail",
-  components: {
-    ListModule,
-    AppCoupon,
-    ModalModule,
-    RateModule
-  },
-  data() {
-    return {
-      constant: this.$constant,
-      // img
-      waitPayImg: `${this.$constant.imgUrl}/retail/order/wait-pay.png`,
-      waitDeliveryImg: `${this.$constant.imgUrl}/retail/order/wait-delivery.png`,
-      data: {},
-      // 修改价格
-      updatePriceModal: false,
-      form: {
-        price: ""
-      },
-      // 免发货
-      freeShipModal: false
-    };
-  },
-  onLoad() {
-    // this.init()
-  },
-  methods: {
-    init() {
-      this._getDet();
-    },
-    _getDet() {
-      return getDetB({ id: this.option.id }).then(res => {
-        this.data = res.data;
-      });
-    },
-    // 免发货
-    freeShippingFn() {
-      this.freeShipModal = true;
-    },
-    // 免发货
-    freeShipModalClick(e) {
-      if (e.index === 0) {
-        this.modalCancel();
-      } else {
-        this.data.status = 5;
-        this.data.sendType = 1;
-        freeShipping({ id: this.data.id }).then(res => {
-          this.$msg("操作成功！");
-          this.modalCancel();
-        });
-      }
-    },
-    // 查看配送
-    seeSendFn() {
-      this.$util.pageTo({
-        url: "/admin/order/ship",
-        query: {
-          id: this.data.id,
-          pageStatus: 5
-        }
-      });
-    },
-    // 修改价格
-    updatePriceFn() {
-      this.form.price = this.data.prePrice;
-      this.updatePriceModal = true;
-    },
-    updateModalClick(e) {
-      if (e.index === 0) {
-        this.modalCancel();
-      } else {
-        orderUpdatePrice({ id: this.data.id, price: this.form.price }).then(
-          res => {
-            this.modalCancel();
-            this.$msg("修改成功!");
-            setTimeout(() => {
-              this._getDet();
-            }, 1000);
-          }
-        );
-      }
-    },
-    // 关闭弹窗
-    modalCancel() {
-      this.form.price = "";
-      this.freeShipModal = false;
-      this.updatePriceModal = false;
-    }
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-.app-content {
-  padding-bottom: 80px;
-}
-.page-top {
-  position: relative;
-  .page-top-det {
-    position: absolute;
-    top: 22px;
-    @include disFlex(center, space-between);
-    width: 84%;
-    padding: 0 48px;
-    color: #fff;
-    .page-status {
-      font-size: 36px;
-      font-weight: bold;
-      margin-bottom: 16px;
-    }
-    .page-prompt {
-      color: #ffdede;
-    }
-    .page-status-img {
-      width: 180px;
-    }
-  }
-}
-.page-det {
-  width: 94%;
-  margin: 0 auto;
-  position: relative;
-  top: -40px;
-  .order-msg {
-    .order-msg-blo {
-      font-size: 28px;
-      padding: 20px 0;
-      border-top: 1px solid $borderColor;
-      .msg-list {
-        @include disFlex(flex-start, space-between);
-        margin: 16px 0;
-        .label {
-          width: 40%;
-          color: $fontColor3;
-        }
-      }
-    }
-    & .order-msg-blo:first-child {
-      border-top: none;
-    }
-  }
-  .coupon-wrap {
-    .module-det {
-      padding: 20px 0;
-    }
-  }
-}
-// 底部按钮
-.page-btn {
-  width: calc(100% - 60px);
-  @include disFlex(center, space-between);
-  padding: 0 30px;
-  .app-price {
-    margin-bottom: 8px;
-    margin-left: 4px;
-  }
-  .red {
-    width: 270px;
-  }
-  .default {
-    width: 260px;
-  }
-  .operate-btn-wrap {
-    .admin-button-com {
-      margin-left: 30px;
-      padding: 20px 30px;
-    }
-  }
-}
-// 公共模块
-.module-com {
-  border-radius: 10px;
-  background-color: #fff;
-  padding: 0 20px;
-  box-shadow: 0px 6px 16px #ddd;
-  margin-bottom: 20px;
-  .module-tit {
-    padding: 20px 0;
-    font-size: 28px;
-    font-weight: 600;
-    border-bottom: 1px solid $borderColor;
-  }
-}
-</style>

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

@@ -1,115 +0,0 @@
-<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>
-</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'
-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)
-			}
-		}
-	}
-}
-</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>

ghs/src/admin/order/ship.vue

@@ -1,273 +0,0 @@
-<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>
-</template>
-
-<script>
-// 选择订单
-import SelOrder from './components/sel-order'
-// 选择发货
-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'
-// 有配送单-发货管理
-import SelShipManage from './components/sel-ship-manage'
-
-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
-					// }
-				}
-			}
-		}
-	}
-}
-</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%;
-			}
-		}
-	}
-</style>

ghs/src/pages.json

@@ -174,35 +174,6 @@
 				}
 			]
 		},
-		{
-			"root": "admin/order",
-			"pages": [
-				{
-					"path": "detail",
-					"style": {
-						"navigationBarTitleText": "详情"
-					}
-				},
-				{
-					"path": "ship",
-					"style": {
-						"navigationBarTitleText": "发货"
-					}
-				},
-				{
-					"path": "fill-form",
-					"style": {
-						"navigationBarTitleText": "填写收花人"
-					}
-				},
-				{
-					"path": "print",
-					"style": {
-						"navigationBarTitleText": "打印"
-					}
-				}
-			]
-		},
 		{
 			"root": "admin/coupon",
 			"pages": [

ghs/src/admin/order/print.vue → ghs/src/pagesOrder/print.vue

@@ -23,8 +23,8 @@
 </template>
 
 <script>
-var tsc = require("../../components/gprint/tsc.js");
-var esc = require("../../components/gprint/esc.js");
+var tsc = require("./js/gprint/tsc.js");
+var esc = require("./js/gprint/esc.js");
 export default {
 	data() {
 		return {

ghs/src/admin/order/print_bak.vue → ghs/src/pagesOrder/print_bak.vue

@@ -11,8 +11,8 @@
 </template>
 
 <script>
-	var tsc = require('../../components/gprint/tsc.js')
-	var esc = require('../../components/gprint/esc.js')
+	var tsc = require("./js/gprint/tsc.js");
+	var esc = require("./js/gprint/esc.js");
 	export default {
 		data() {
 			return {

ghs/src/pagesStore/me/incomeExpenses.vue

@@ -1,12 +1,66 @@
+
 <template>
     <div>
-        收支
+       <block v-if="!$util.isEmpty(list.data)">
+        <AppTabel
+                :headerBackgroundColor="'#F0F2F6'"
+                :columns="columns"
+                :dataList="list"
+            >
+            </AppTabel>
+        </block>
+        <block v-else>
+            <AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
+        </block>
     </div>
 </template>
 
 <script>
+    import AppTabel from "@/components/app-table";
+    import AppWrapperEmpty from "@/components/app-wrapper-empty";
     export default {
-        name:'IncomeExpenses' // 收支
+        name:'IncomeExpenses', //收支记录
+        components:{
+            AppTabel,
+            AppWrapperEmpty
+        },
+        data(){
+            return {
+                    columns: [
+                    {
+                        name: "事项",
+                        dataIndex: "typeName",
+                        color: "info",
+                        align: "center"
+                    },
+                    {
+                        name: "提现记录",
+                        dataIndex: "typeName",
+                        color: "info",
+                        align: "center"
+                    },
+                    {
+                        name: "余额",
+                        dataIndex: "typeName",
+                        color: "info",
+                        align: "center"
+                    },
+                    {
+                        name: "状态",
+                        dataIndex: "typeName",
+                        color: "info",
+                        align: "center"
+                    }
+                ],
+                list:[{ time:'1221',typeName:'hahah',stock:'121255'}]
+            }
+        },
+        methods:{
+
+        },
+        onPullDownRefresh(){
+
+        }
     }
 </script>
 

ghs/src/pagesStore/me/withdraw.vue

@@ -1,12 +1,65 @@
 <template>
     <div>
-        明细
+       <block v-if="!$util.isEmpty(list.data)">
+        <AppTabel
+                :headerBackgroundColor="'#F0F2F6'"
+                :columns="columns"
+                :dataList="list"
+            >
+            </AppTabel>
+        </block>
+        <block v-else>
+            <AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
+        </block>
     </div>
 </template>
 
 <script>
+    import AppTabel from "@/components/app-table";
+    import AppWrapperEmpty from "@/components/app-wrapper-empty";
     export default {
-        name:'withDraw' //提现记录
+        name:'withDraw', //提现记录
+        components:{
+            AppTabel,
+            AppWrapperEmpty
+        },
+        data(){
+            return {
+                    columns: [
+                    {
+                        name: "事项",
+                        dataIndex: "typeName",
+                        color: "info",
+                        align: "center"
+                    },
+                    {
+                        name: "提现记录",
+                        dataIndex: "typeName",
+                        color: "info",
+                        align: "center"
+                    },
+                    {
+                        name: "余额",
+                        dataIndex: "typeName",
+                        color: "info",
+                        align: "center"
+                    },
+                    {
+                        name: "状态",
+                        dataIndex: "typeName",
+                        color: "info",
+                        align: "center"
+                    }
+                ],
+                list:[{ time:'1221',typeName:'hahah',stock:'121255'}]
+            }
+        },
+        methods:{
+
+        },
+        onPullDownRefresh(){
+
+        }
     }
 </script>
 

ghs/src/pagesStorehouse/allot/addExDetails.vue

@@ -91,7 +91,7 @@
 	</view>
 </template>
 <script>
-import Tabel from "../components/table";
+import Tabel from "@/components/app-table";
 import TuiListCell from "@/components/plugin/list-cell";
 import productMins from "@/mixins/product";
 

ghs/src/pagesStorehouse/allot/exDetails.vue

@@ -94,7 +94,7 @@
 	</view>
 </template>
 <script>
-import Tabel from "../components/table";
+import Tabel from "@/components/app-table";
 import { OUT_STATUS } from "@/utils/declare";
 import {
 	getStockOutDetailApi,

ghs/src/pagesStorehouse/allot/putDetails.vue

@@ -83,7 +83,7 @@
 	</view>
 </template>
 <script>
-import Tabel from "../components/table";
+import Tabel from "@/components/app-table";
 import { PUT_STATUS } from "@/utils/declare";
 import { getStockInDetailApi, confirmOrderApi } from "@/api/storehouse/stock";
 import AppWrapperEmpty from "@/components/app-wrapper-empty";

ghs/src/pagesStorehouse/flower/category.vue

@@ -66,7 +66,7 @@
 	</view>
 </template>
 <script>
-import Tabel from "../components/table";
+import Tabel from "@/components/app-table";
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
 import { list } from "@/mixins";
 import {

ghs/src/pagesStorehouse/flower/manage.vue

@@ -87,7 +87,7 @@
 	</view>
 </template>
 <script>
-import Tabel from "../components/table";
+import Tabel from "@/components/app-table";
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
 import { list } from "@/mixins";
 import {

ghs/src/pagesStorehouse/inventory/details.vue

@@ -82,7 +82,7 @@
 	</view>
 </template>
 <script>
-import Tabel from "../components/table";
+import Tabel from "@/components/app-table";
 import { getCheckOrderDetailApi } from "@/api/inventory/index";
 import { INVENTORY_STATUS } from "@/utils/declare";
 

ghs/src/pagesStorehouse/stockWarn/detailed.vue

@@ -39,7 +39,7 @@
 	</view>
 </template>
 <script>
-import Tabel from "../components/table";
+import Tabel from "@/components/app-table";
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
 
 import SelectList from "@/components/plugin/selectList";

saas/dist/saas/cdn/nprogress/0.2.0/nprogress.min.css

@@ -1 +0,0 @@
-#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;-webkit-transform:rotate(3deg) translate(0,-4px);-ms-transform:rotate(3deg) translate(0,-4px);transform:rotate(3deg) translate(0,-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;-webkit-animation:nprogress-spinner 400ms linear infinite;animation:nprogress-spinner 400ms linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@-webkit-keyframes nprogress-spinner{0%{-webkit-transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg)}}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}100%{transform:rotate(360deg)}}

saas/dist/saas/index.html

@@ -43,4 +43,4 @@
 			.once .sub-title {
 				color: #ababab;
 				font-size: 12px;
-			}</style><link href=/css/app.6f07e55a.css rel=preload as=style><link href=/css/chunk-libs.14efb97a.css rel=preload as=style><link href=/js/app.50ca3d4c.js rel=preload as=script><link href=/js/chunk-libs.6cdd4aee.js rel=preload as=script><link href=/css/chunk-libs.14efb97a.css rel=stylesheet><link href=/css/app.6f07e55a.css rel=stylesheet></head><body><noscript></noscript><div id=app><div class=once><div class=container><div class=title>正在加载资源</div><div class=sub-title>初次加载资源可能需要较多时间 请耐心等待</div></div><div class=footer><a href=https://www.baidu.com/ target=_blank>花卉宝</a></div></div></div><script src=/cdn/vue/2.6.10/vue.min.js></script><script src=/cdn/vue-router/3.1.3/vue-router.min.js></script><script src=/cdn/vuex/3.1.1/vuex.min.js></script><script src=/cdn/clipboard.js/2.0.4/clipboard.min.js></script><script src=/cdn/axios/0.19.0-beta.1/axios.min.js></script><script src=/cdn/nprogress/0.2.0/nprogress.min.js></script><script src=/cdn/Mock.js/1.0.1-beta3/mock-min.js></script><script src=/cdn/quill/2.0.0-dev.3/quill.min.js></script><script src=/cdn/element-ui/2.13.0/index.js></script><script src=/cdn/viewerjs/1.3.7/viewer.min.js></script><script src=/cdn/echarts/4.4.0-rc.1/echarts.min.js></script><script src=/cdn/npm/vue-echarts@4.0.2.js></script><script src=/js/chunk-libs.6cdd4aee.js></script><script src=/js/app.50ca3d4c.js></script></body></html>
+			}</style><link href=/css/app.6f07e55a.css rel=preload as=style><link href=/css/chunk-libs.14efb97a.css rel=preload as=style><link href=/js/app.3335e901.js rel=preload as=script><link href=/js/chunk-libs.3aaf2719.js rel=preload as=script><link href=/css/chunk-libs.14efb97a.css rel=stylesheet><link href=/css/app.6f07e55a.css rel=stylesheet></head><body><noscript></noscript><div id=app><div class=once><div class=container><div class=title>正在加载资源</div><div class=sub-title>初次加载资源可能需要较多时间 请耐心等待</div></div><div class=footer><a href=https://www.baidu.com/ target=_blank>花卉宝</a></div></div></div><script src=/cdn/vue/2.6.10/vue.min.js></script><script src=/cdn/vue-router/3.1.3/vue-router.min.js></script><script src=/cdn/vuex/3.1.1/vuex.min.js></script><script src=/cdn/clipboard.js/2.0.4/clipboard.min.js></script><script src=/cdn/axios/0.19.0-beta.1/axios.min.js></script><script src=/cdn/nprogress/0.2.0/nprogress.min.js></script><script src=/cdn/Mock.js/1.0.1-beta3/mock-min.js></script><script src=/cdn/quill/2.0.0-dev.3/quill.min.js></script><script src=/cdn/element-ui/2.13.0/index.js></script><script src=/cdn/viewerjs/1.3.7/viewer.min.js></script><script src=/cdn/echarts/4.4.0-rc.1/echarts.min.js></script><script src=/cdn/npm/vue-echarts@4.0.2.js></script><script src=/js/chunk-libs.3aaf2719.js></script><script src=/js/app.3335e901.js></script></body></html>