文档内容部分修改

ghs/src/admin/home/order.vue

@@ -8,14 +8,14 @@
 			<view class="select-dn_bx">
 				<DorpdownSelect 
 					:selectItemId.sync="selectItemId"
-					:typeSelect="1" top="50px" 
+					:typeSelect="1" top="0px" 
 					@selectSussess="selectSussess" />
 			</view>
 		</view>
 		<app-tabs
 			:tabs="tabs"
 			:isFixed="true"
-			:top="55"
+			:top="50"
 			:currentTab="tabIndex"
 			:height="100"
 			@change="change"
@@ -79,7 +79,8 @@
 							<view v-for="s in item.buttonList" :key="s.type">
 								<button
 									@click.stop="openBt(s, item)"
-									v-if="s.disable == 1"
+									v-if="s.show == 1"
+									:disabled="s.disable === 1"
 									class="admin-button-com bule"
 								>
 									{{
@@ -240,14 +241,15 @@ export default {
 			}
 		}, // 操作按钮
 		openBt(s, item) {
+			console.log(123)
 			// 花材
-			if (s.item === "item") {
+			if (s.type === "item") {
 				// 自取
-			} else if (s.item === "selfGet") {
+			} else if (s.type === "selfGet") {
 				this.freeShipModal = true;
 				this.operateData = item;
 				//发货
-			} else if (s.item === "send") {
+			} else if (s.type === "send") {
 				this.pageTo({
 					url: "/pagesOrder/ship",
 					query: {

ghs/src/components/module/dorpdownSelect.vue

@@ -60,7 +60,7 @@
                 type: Object,
                 default: ()=>({
                     title:'时间',
-                    titleChild:'门店',
+                    titleChild:'时间',
                     list: [{name:'昨天',id:'0'},{name:'今天',id:'1'},{name:'本月',id:'2'},{name:'上月',id:'3'},{name:'今年',id:'4'}]  
                 })
             },

ghs/src/pagesClient/official/latest-shop.vue

@@ -25,7 +25,9 @@
           </div>
       </view>
       <view class="app-footer">
-          <view class="des">
+          <view @click="pageTo({
+            url:`/pagesClient/official/index?introMerchantId=${this.userInfo.id}&form=2&style=2`
+          })" class="des">
               我是供货商，点此 <text>申请开店</text><i class="iconfont iconxiangyou"></i>
           </view>
       </view>
@@ -36,6 +38,7 @@
 import { recentShop } from "@/api/official";
 import { share } from "@/mixins";
 import AppAvatarModule from "@/components/module/app-avatar";
+import {mapGetters} from 'vuex'
 export default {
   name: "shop-list",
   components: {AppAvatarModule},
@@ -45,6 +48,9 @@ export default {
       list:[]
     };
   },
+  computed: {
+		...mapGetters({ userInfo: "getUser" })
+	},
   onLoad() {
     
   },

ghs/src/pagesInvite/list.vue

@@ -102,7 +102,7 @@ export default {
 	},
 	mixins: [list],
 	computed: {
-		...mapGetters({ userInfo: "getUser" })
+		...mapGetters({ userInfo: "getUser",loginInfo: "getLoginInfo"})
 	},
 	data() {
 		return {
@@ -176,7 +176,7 @@ export default {
 				title: "更懂您的花卉宝",
 				desc: "",
 				imgUrl: this.constant.imgUrl + "/retail/official/banner-1.png",
-				path: `/pagesClient/official/index?introMerchantId=${this.userInfo.id}&form=2&style=2`
+				path: `/pagesClient/official/index?introMerchantId=${this.userInfo.id}&form=2&style=2&shopAdminId=${this.getLoginInfo.shopAdminId}`
 			};
 		} else if (res.target.id === "sharekh") {
 			return {