app 更新

ghsApp/dist/build/mp-weixin/admin/home/components/module/operate-line.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/admin/home/components/plugin/time-axis.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/app-coupon-sel.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/app-date-picker.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/app-img.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/kd_entrance.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/module/allMoreSelectInput.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/module/allSelectInput.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/plugin/bottom-popup.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/plugin/fab.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/plugin/modal.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/plugin/selectList.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/plugin/simple-address.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-td.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-th.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-tr.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/pagesInvite/inviteItem.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/pagesOrder/components/stepShip.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/pagesOrder/components/stepStatus.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/src/admin/home/member.vue

@@ -139,6 +139,7 @@ export default {
 
 <style lang="scss" scoped>
 .app-content {
+  padding-top: 22rpx;
   padding-bottom: 20px;
 }
 .tabs-wrap {

hdApp/dist/build/mp-weixin/admin/home/components/module/operate-line.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/admin/home/components/module/operate.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

hdApp/dist/build/mp-weixin/admin/home/components/plugin/time-axis.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/admin/order/components/card-name.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/admin/order/components/sel-order.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["admin/order/components/sel-order"],{"05c7":function(n,e,t){"use strict";var i;t.d(e,"b",(function(){return r})),t.d(e,"c",(function(){return o})),t.d(e,"a",(function(){return i}));var r=function(){var n=this,e=n.$createElement;n._self._c},o=[]},1414:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var i=t("3a10"),r=function(){t.e("admin/home/components/plugin/time-axis").then(function(){return resolve(t("9193"))}.bind(null,t)).catch(t.oe)},o=function(){t.e("admin/home/components/plugin/timeaxis-item").then(function(){return resolve(t("9758"))}.bind(null,t)).catch(t.oe)},u={name:"sel-order-module",components:{TimeAxis:r,TimeaxisItem:o},props:{query:{type:Object,default:function(){}},orderData:{type:Object,default:function(){}}},data:function(){return{data:{}}},mounted:function(){},methods:{hasSendOrderFn:function(){var n=this;(0,i.printOrder)({id:this.orderData.id,option:1}).then((function(e){n.$emit("nextPageSuccess",{id:n.orderData.id,pageStatus:7})}))}}};e.default=u},"52e7":function(n,e,t){},a6ff:function(n,e,t){"use strict";var i=t("52e7"),r=t.n(i);r.a},bf50:function(n,e,t){"use strict";t.r(e);var i=t("1414"),r=t.n(i);for(var o in i)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return i[n]}))}(o);e["default"]=r.a},ecde:function(n,e,t){"use strict";t.r(e);var i=t("05c7"),r=t("bf50");for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);t("a6ff");var u,a=t("0095"),c=Object(a["a"])(r["default"],i["b"],i["c"],!1,null,"133340ca",null,!1,i["a"],u);e["default"]=c.exports}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["admin/order/components/sel-order"],{"016b":function(n,e,t){"use strict";var i=t("42f8"),r=t.n(i);r.a},"09ed":function(n,e,t){"use strict";var i;t.d(e,"b",(function(){return r})),t.d(e,"c",(function(){return o})),t.d(e,"a",(function(){return i}));var r=function(){var n=this,e=n.$createElement;n._self._c},o=[]},1414:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var i=t("3a10"),r=function(){t.e("admin/home/components/plugin/time-axis").then(function(){return resolve(t("9193"))}.bind(null,t)).catch(t.oe)},o=function(){t.e("admin/home/components/plugin/timeaxis-item").then(function(){return resolve(t("9758"))}.bind(null,t)).catch(t.oe)},u={name:"sel-order-module",components:{TimeAxis:r,TimeaxisItem:o},props:{query:{type:Object,default:function(){}},orderData:{type:Object,default:function(){}}},data:function(){return{data:{}}},mounted:function(){},methods:{hasSendOrderFn:function(){var n=this;(0,i.printOrder)({id:this.orderData.id,option:1}).then((function(e){n.$emit("nextPageSuccess",{id:n.orderData.id,pageStatus:7})}))}}};e.default=u},"42f8":function(n,e,t){},bf50:function(n,e,t){"use strict";t.r(e);var i=t("1414"),r=t.n(i);for(var o in i)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return i[n]}))}(o);e["default"]=r.a},ecde:function(n,e,t){"use strict";t.r(e);var i=t("09ed"),r=t("bf50");for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);t("016b");var u,a=t("0095"),c=Object(a["a"])(r["default"],i["b"],i["c"],!1,null,"895fe7e0",null,!1,i["a"],u);e["default"]=c.exports}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'admin/order/components/sel-order-create-component',
     {

hdApp/dist/build/mp-weixin/admin/order/components/sel-order.wxml

@@ -1 +1 @@
-<view class="sel-order-module _div data-v-133340ca"><time-axis vue-id="3493b9d5-1" class="data-v-133340ca" bind:__l="__l" vue-slots="{{['default']}}"><timeaxis-item class="axis-list axis-first print-order data-v-133340ca" vue-id="{{('3493b9d5-2')+','+('3493b9d5-1')}}" bgcolor="none" bind:__l="__l" vue-slots="{{['node','content']}}"><view slot="node"><view class="tui-node node-big _div data-v-133340ca"><view class="node-small _div data-v-133340ca"></view></view></view><view slot="content"><view class="axis-slot-wrap _div data-v-133340ca"><view class="axis-title _div data-v-133340ca">制单</view><view class="axis-det _div data-v-133340ca"><button data-event-opts="{{[['tap',[['hasSendOrderFn',['$event']]]]]}}" class="admin-button-com big blue data-v-133340ca" bindtap="__e">跳过</button><button data-event-opts="{{[['tap',[['pageTo',[['o',['url','/admin/order/fill-form'],['query',{id:orderData.id}]]]]]]]}}" class="admin-button-com big blue data-v-133340ca" bindtap="__e">填写</button></view></view></view></timeaxis-item><timeaxis-item class="axis-list down-order data-v-133340ca" vue-id="{{('3493b9d5-3')+','+('3493b9d5-1')}}" bgcolor="none" bind:__l="__l" vue-slots="{{['content']}}"><view slot="content"><view class="axis-slot-wrap _div data-v-133340ca"><view class="axis-title _div data-v-133340ca">下单</view><view class="axis-det _div data-v-133340ca"><view class="_div data-v-133340ca">{{orderData.addTime}}</view></view></view></view></timeaxis-item></time-axis></view>
+<view class="sel-order-module _div data-v-895fe7e0"><time-axis vue-id="3493b9d5-1" class="data-v-895fe7e0" bind:__l="__l" vue-slots="{{['default']}}"><timeaxis-item class="axis-list axis-first print-order data-v-895fe7e0" vue-id="{{('3493b9d5-2')+','+('3493b9d5-1')}}" bgcolor="none" bind:__l="__l" vue-slots="{{['node','content']}}"><view slot="node"><view class="tui-node node-big _div data-v-895fe7e0"><view class="node-small _div data-v-895fe7e0"></view></view></view><view slot="content"><view class="axis-slot-wrap write_button _div data-v-895fe7e0"><view class="axis-title _div data-v-895fe7e0">制单</view><view class="axis-det _div data-v-895fe7e0"><button data-event-opts="{{[['tap',[['hasSendOrderFn',['$event']]]]]}}" class="admin-button-com big blue data-v-895fe7e0" bindtap="__e">跳过</button><button data-event-opts="{{[['tap',[['pageTo',[['o',['url','/admin/order/fill-form'],['query',{id:orderData.id}]]]]]]]}}" class="admin-button-com big blue data-v-895fe7e0" bindtap="__e">填写</button></view></view></view></timeaxis-item><timeaxis-item class="axis-list down-order data-v-895fe7e0" vue-id="{{('3493b9d5-3')+','+('3493b9d5-1')}}" bgcolor="none" bind:__l="__l" vue-slots="{{['content']}}"><view slot="content"><view class="axis-slot-wrap _div data-v-895fe7e0"><view class="axis-title _div data-v-895fe7e0">下单</view><view class="axis-det _div data-v-895fe7e0"><view class="_div data-v-895fe7e0">{{orderData.addTime}}</view></view></view></view></timeaxis-item></time-axis></view>

hdApp/dist/build/mp-weixin/admin/order/components/sel-order.wxss

@@ -1 +1 @@
-.print-order .axis-slot-wrap.data-v-133340ca{top:-4rpx!important}.print-order .axis-det.data-v-133340ca{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;margin-top:50rpx;margin-bottom:10rpx}.print-order .axis-det .admin-button-com.data-v-133340ca{width:48%}.down-order .axis-det.data-v-133340ca{margin-top:14rpx}
+.print-order .axis-slot-wrap.data-v-895fe7e0{top:-4rpx!important}.print-order .axis-det.data-v-895fe7e0{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;margin-top:50rpx;margin-bottom:10rpx}.print-order .axis-det .admin-button-com.data-v-895fe7e0{width:48%}.down-order .axis-det.data-v-895fe7e0{margin-top:14rpx}.write_button.data-v-895fe7e0{padding-bottom:25rpx}

hdApp/dist/build/mp-weixin/components/app-coupon-sel.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

hdApp/dist/build/mp-weixin/components/app-date-picker.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

hdApp/dist/build/mp-weixin/components/app-img.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/components/module/app-avatar.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

hdApp/dist/build/mp-weixin/components/module/app-search.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/components/plugin/modal.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/components/plugin/rate.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/components/plugin/simple-address.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/pagesInvite/inviteItem.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/src/admin/home/member.vue

@@ -123,7 +123,7 @@ export default {
 
 <style lang="scss" scoped>
 .app-content {
-  padding-top: 20rpx;
+  padding-top: 22rpx;
   padding-bottom: 30rpx;
 }
 .tabs-wrap {

hdApp/src/admin/home/workbench.vue

@@ -330,11 +330,11 @@ export default {
             this.orderData[2].value = todayData.order;
             // 总览数据
             this.totalData[0].value = asset.totalUser;
-            this.totalData[1].value = asset.totalMember;
-            this.totalData[2].value = asset.totalVisit;
+            this.totalData[1].value = asset.totalView;
+            this.totalData[2].value = asset.totalOrder;
             this.totalData[3].value = asset.totalIncome;
             this.totalData[4].value = asset.totalExpend;
-            this.totalData[5].value = asset.remainSmsNum;
+            this.totalData[5].value = asset.totalPurchase;
           }
         });
       }

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

@@ -10,16 +10,11 @@
 					</div>
 				</template>
 				<template v-slot:content>
-					<div class="axis-slot-wrap">
+					<div class="axis-slot-wrap write_button">
 						<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>
+							<button class="admin-button-com big blue" @click="pageTo({url: '/admin/order/fill-form',query: {id: orderData.id}})">填写</button>
 						</div>
 					</div>
 				</template>
@@ -69,21 +64,8 @@ export default {
 	},
 	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
-				// 	}
-				// })
+			printOrder({id: this.orderData.id,option: 1}).then(res => {
+				this.$emit('nextPageSuccess', {id: this.orderData.id,pageStatus: 7})
 			})
 		}
 	}
@@ -111,4 +93,7 @@ export default {
 			margin-top: 14px;
 		}
 	}
+	.write_button{
+		padding-bottom:25rpx;
+	}
 </style>

hdApp/src/admin/order/detail.vue

@@ -63,27 +63,10 @@
               <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>
@@ -146,9 +129,6 @@
         </span>
       </div>
       <template>
-        <!--
-				<button class="admin-button-com middle" @click="updatePriceFn">修改价格</button>
-        -->
       </template>
       <template>
         <div class="operate-btn-wrap">
@@ -180,9 +160,6 @@
           </block>
         </div>
       </template>
-      <!-- <template v-if="data.status == 5">
-				<button class="admin-button-com middle">退款</button>
-      </template>-->
     </div>
     <!-- 修改价格 -->
     <modal-module
@@ -219,7 +196,6 @@
       :size="32"
       padding="30rpx 30rpx"
     ></modal-module>
-    <kd-entrance></kd-entrance>
   </div>
 </template>
 
@@ -380,7 +356,7 @@ export default {
 }
 // 底部按钮
 .page-btn {
-  width: calc(100% - 60px);
+  //width: calc(100% - 20px);
   @include disFlex(center, space-between);
   padding: 0 30px;
   .app-price {