按文档调整

ghs/src/admin/billing/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="billing_box_bg">
 		<view class="input-wrap">
-			<app-search-module placeholder="请输入关键词搜索" @search="searchFn" />
+			<app-search-module placeholder="请输入关键词" @search="searchFn" />
 		</view>
 		<app-tabs
 			:tabs="tabs"
@@ -248,9 +248,12 @@ export default {
 			}
 		},
 		confirmSelectEvent() {
-			if (this.selectList.length > 0) {
-				this.showSubmitModel = true;
-			}
+			uni.navigateTo({
+				url: "/admin/billing/affirm"
+			});
+			// if (this.selectList.length > 0) {
+			// 	this.showSubmitModel = true;
+			// }
 		},
 		change(e) {
 			if (this.tabIndex == e.index) {

ghs/src/admin/billing/priceChange.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="billing_box_bg">
     <view class="input-wrap">
-      <app-search-module placeholder="请输入关键词搜索"
+      <app-search-module placeholder="请输入关键词"
                          @search="searchFn" />
     </view>
     <view class="scroll-middle_bx">

ghs/src/admin/home/order.vue

@@ -24,8 +24,7 @@
 					class="list"
 					v-for="(item, index) in list.data"
 					:key="index"
-					@click="
-						pageTo({
+					@click="pageTo({
 							url: '/pagesOrder/detail',
 							query: {
 								id: item.id

ghs/src/admin/home/workbench.vue

@@ -5,11 +5,11 @@
 			<div class="user-top">
 				<div class="app-size-28">今日概况</div>
 				<view class="open-bt_bx">
-					<button id="shareStore" open-type="share" style="margin-right:8px;">
+					<button id="shareStore" open-type="share" class="admin-button-com">
 						<i class="iconfont iconfenxiang"></i>
 						商城分享
 					</button>
-					<button id="sharePay" open-type="share">
+					<button id="sharePay" open-type="share" class="admin-button-com" style="margin-left: 8px;">
 						<i class="iconfont iconshoukuanma"></i>
 						收款
 					</button>
@@ -222,7 +222,7 @@ export default {
 				// },
 				{
 					name: "库存预警",
-					img: `${this.$constant.imgUrl}/ghs/home/kcyj.png`,
+					img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`,
 					url: "/pagesStorehouse/stockWarn/manage"
 				},
 				{
@@ -273,7 +273,8 @@ export default {
 				{
 					name: "全部",
 					img: `${this.$constant.imgUrl}/ghs/home/qball.png`,
-					url: "/admin/interest/my-invite"
+					url: "/admin/home/apply",
+					type:4
 				}
 				// {
 				//   name: "进货",
@@ -323,14 +324,14 @@ export default {
 				title: "商城分享",
 				desc: "",
 				imgUrl: "",
-				pagePath: "pagesShare/pay"
+				pagePath: "/admin/billing/index"
 			};
 		} else if (res.target.id === "sharePay") {
 			return {
 				title: "分享收款",
 				desc: "",
 				imgUrl: "",
-				pagePath: "pagesShare/pay"
+				pagePath: "/pagesShare/pay"
 			};
 		} else {
 			return {};
@@ -431,13 +432,16 @@ export default {
 		.open-bt_bx {
 			display: flex;
 			align-items: center;
+			line-height: 1upx;
 			& > button {
+				padding:0;
+				line-height: auto;
 				background-color: transparent;
 				border: 1px solid #ffffff;
 				border-radius: 22px;
-				padding: 0px 17px;
-				height: 44px;
-				line-height: 44px;
+				padding: 10upx 17upx!important;
+				// height: 44px;
+				// line-height: 44px;
 				font-size: 24px;
 				font-family: PingFang SC;
 				font-weight: 400;

ghs/src/components/app-flower-sel.vue

@@ -8,10 +8,10 @@
 				</div>
 				<!-- 搜索 -->
 				<div class="map-search">
+					<!-- :focus="false" -->
 					<app-search-module
 						ref="aaaaa"
-						placeholder="请输入关键字"
-						:focus="false"
+						placeholder="请输入关键词"
 						@input="searchFn"
 					/>
 				</div>

ghs/src/components/module/app-commodity.vue

@@ -24,11 +24,11 @@
 					<input
 						class="change-input"
 						:value="autoPrice"
-						type="text"
+						type="number"
 						placeholder="自动调价"
 						@change="changePriceEvent"
 					/>
-					<i class="iconfont icondelete" @click="removeEvent"></i>
+					<i class="iconfont iconcachu" @click="removeEvent"></i>
 				</view>
 			</view>
 		</view>
@@ -138,8 +138,8 @@ export default {
 					color: #3385ff;
 					font-size: 40px;
 				}
-				.icondelete {
-					margin: 0 10px 0 30px;
+				.iconcachu {
+					margin: 0 6px 0 20px;
 					color: #ccc;
 					&.edit {
 						color: #3385ff;

ghs/src/mixins/globalMixins.js

@@ -59,13 +59,15 @@ export default {
 							});
 						//未知身份
 						}else{
-							this.$util.pageTo({
-								url: "/pagesClient/official/index",
-								type: 2,
-								query: {
-									...this.option	
-								}
-							});
+							if(this.option.style != 1){
+								this.$util.pageTo({
+									url: "/pagesClient/official/index",
+									type: 2,
+									query: {
+										...this.option	
+									}
+								});
+							}	
 						}
 					}
 					getUser()

ghs/src/pagesArrears/list.vue

@@ -15,7 +15,14 @@
 				</view>
 				<view class="item-main">
 					<view class="phone">15280215347 </view>
-					<view class="price"
+					<view 
+						@click="pageTo({
+							url: '/pagesOrder/detail',
+							query: {
+								id: 0
+							}
+						})"
+						class="price"
 						>¥580.50 <text class="iconfont iconxiangyou"></text>
 					</view>
 				</view>
@@ -28,7 +35,7 @@
 					-¥
 				</text>
 				<text class="price">
-					7,867,531.95
+					7867531.95
 				</text>
 			</view>
 		</view>

ghs/src/pagesClient/member/detail.vue

@@ -23,7 +23,7 @@
             <view 
               v-else
               class="already-shop">
-              <i class="iconfont iconweixinlaiyuan"></i>
+              <i class="iconfont iconyikaidian"></i>
               已开店
             </view>
         </view>
@@ -50,19 +50,21 @@
             <view>
                 <view>
                   {{userInfo.userName}} {{userInfo.mobile}}
+                  <button
+                    @click="pageTo({
+                      url:'/pagesClient/member/bind'
+                    })" 
+                    class="admin-button-com default">
+                    关联微信
+                  </button>
+                  <!-- <i class="iconfont iconweixinlaiyuan _i"></i> -->
                 </view>
-                <view class="">
+                <view>
                   {{userInfo.address}}
                 </view>
             </view>
             <view>
-              <view
-                @click="pageTo({
-                  url:'/pagesClient/member/bind'
-                })" 
-                class="invite-bt white">
-                关联微信
-              </view>
+              
               <i @click="callUp" class="iconfont icondianhua1"></i>
             </view>
           </view>
@@ -76,10 +78,10 @@
                 <switch :checked="form.debt == 0 ? false : true" @change="remindChangeFn" />
               </div>
             </tui-list-cell>
-            <tui-list-cell class="line-cell" :hover="false" :arrow="true">
+            <!-- <tui-list-cell class="line-cell" :hover="false" :arrow="true">
               <div class="tui-title">消费记录</div>
-              <!-- <input v-model="form.name" placeholder-class="phcolor" class="tui-input" name="name" placeholder="请输入" maxlength="50" type="text" /> -->
-            </tui-list-cell>
+              <input v-model="form.name" placeholder-class="phcolor" class="tui-input" name="name" placeholder="请输入" maxlength="50" type="text" />
+            </tui-list-cell> -->
         </view>
       </view>
     </templete>
@@ -300,6 +302,9 @@ export default {
       text-align: center;
       margin:20px 0px;
       border-right: 1px solid $borderColor;
+      .app-color-3 {
+        font-size: 24upx;
+      }
       .list-num {
         margin-top: 8px;
         margin-bottom: 8px;
@@ -334,17 +339,23 @@ export default {
     & > view:nth-child(1) {
       flex: 1;
       margin-top: 10px;
+
       & > view:nth-child(1) {
         color: #333333;
         font-size: 28px;
         font-weight: bold;
+        display: flex;
+        align-items: center;
+        & .admin-button-com {
+          margin-left: 10upx;
+          border-radius: 25upx;
+        }
       }
       & > view:nth-child(2) {
-        color: #666666;
-        font-size: 28px;
-        font-weight: 400;
-        margin-top: 20px;
-        
+          color: #666666;
+          font-size: 28px;
+          font-weight: 400;
+          margin-top: 20px; 
       }
     }
     & > view:nth-child(2) {

ghs/src/pagesInvite/list.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="invite-page">
+	<view class="invite-page app-content">
 		<view class="tabs">
 			<Tabs
 				:tabs="pageTabs"
@@ -13,8 +13,8 @@
 			<view class="info-main">
 				<app-avatar-module :width="100" />
 				<view class="content">
-					<view class="mark"> {{ userInfo.merchantName || "" }}</view>
-					<view class="name"> 三级代理 </view>
+					<view class="name"> {{ userInfo.merchantName || "" }}</view>
+					<view class="mark"> 三级代理 </view>
 				</view>
 				<button
 					id="sharekh"
@@ -43,20 +43,20 @@
 			</view>
 			<view class="info-list">
 				<view class="info-item">
-					<view class="item-name">{{ balance || 0 }}</view>
-					<view class="item-value">帐户余额(¥)</view>
+					<view class="item-value">{{ balance || 0 }}</view>
+					<view class="item-name">帐户余额(¥)</view>
 				</view>
 				<view class="info-item">
-					<view class="item-name">{{ invitedNum || 0 }}</view>
-					<view class="item-value">已邀请</view>
+					<view class="item-value">{{ invitedNum || 0 }}</view>
+					<view class="item-name">已邀请</view>
 				</view>
 				<view class="info-item">
-					<view class="item-name">{{ payNum || 0 }}</view>
-					<view class="item-value">已付费</view>
+					<view class="item-value">{{ payNum || 0 }}</view>
+					<view class="item-name">已付费</view>
 				</view>
 				<view class="info-item">
-					<view class="item-name">{{ income || 0 }}</view>
-					<view class="item-value">累计收益(¥)</view>
+					<view class="item-value">{{ income || 0 }}</view>
+					<view class="item-name">累计收益(¥)</view>
 				</view>
 			</view>
 		</view>
@@ -110,13 +110,13 @@ export default {
 			pageIndex: 0,
 			constant: this.$constant,
 			pageTabs: [
-				{
-					name: "供应商",
-					key: "1"
-				},
 				{
 					name: "零售商",
 					key: "2"
+				},
+				{
+					name: "供货商",
+					key: "1"
 				}
 			],
 			tabIndex: 0,
@@ -183,7 +183,7 @@ export default {
 				title: "更懂您的花卉宝",
 				desc: "",
 				imgUrl: this.constant.imgUrl + "/retail/official/banner-1.png",
-				pagePath: `/pagesClient/official/index?introMerchantId=${this.userInfo.id}&form=2&style=2`
+				pagePath: `/pagesClient/official/index?introMerchantId=${this.userInfo.id}&form=2&style=1`
 			};
 		} else {
 			return {};
@@ -243,8 +243,8 @@ export default {
 	height: 100%;
 	display: flex;
 	flex-direction: column;
-	background-color: #f9fbfc;
 	.info-view {
+		margin-top: 20upx;
 		padding: 40upx 30upx;
 		background-color: #fff;
 		.info-main {
@@ -287,8 +287,7 @@ export default {
 			}
 		}
 		.info-list {
-			margin-top: 30upx;
-
+			margin-top: 50upx;
 			display: flex;
 			.info-item {
 				flex: 1;
@@ -297,7 +296,6 @@ export default {
 				align-items: center;
 				.item-name {
 					margin-top: 15upx;
-
 					font-size: 24upx;
 					font-weight: 400;
 					color: #999999;
@@ -312,13 +310,13 @@ export default {
 		}
 	}
 	.list-title {
-		padding: 30upx;
+		padding: 30upx 30upx 15upx;
 		font-size: 24upx;
 		font-weight: 400;
 		color: #999999;
 	}
 	.invite-list {
-		margin-top: 20upx;
+		// margin-top: 20upx;
 		flex: 1;
 		padding-bottom: 150upx;
 	}

ghs/src/pagesPurchase/order.vue

@@ -1,14 +1,15 @@
 <template>
 	<view class="order-page">
+				<!-- @add="addEvent"
+				isAdd
+				addText="筛选" -->
 		<view class="tabs">
 			<Tabs
+				:isFixed="true"
 				:tabs="tabs"
-				:itemWidth="'23%'"
 				:currentTab="tabIndex"
 				@change="changeTabEvent"
-				@add="addEvent"
-				isAdd
-				addText="筛选"
+				itemWidth="20%"
 			></Tabs>
 		</view>
 		<scroll-view scroll-y class="order-list">
@@ -189,7 +190,7 @@ export default {
 	flex-direction: column;
 	background-color: #f9fbfc;
 	.order-list {
-		padding-top: 20upx;
+		padding-top: 80upx;
 		flex: 1;
 		// padding-bottom: 50upx;
 		.allot-item {

ghs/src/pagesStorehouse/stockWarn/manage.vue

@@ -6,8 +6,11 @@
 			@change="change"
 			itemWidth="50%"
 		/>
-		<view class="input-wrap">
-			<view class="city-select text-line">
+		<view 
+			class="input-wrap">
+			<view 
+				v-if="loginInfo.super == 1"
+				class="city-select text-line">
 				瑞经典<text class="iconfont iconsanjiao_xia"></text>
 			</view>
 			<view class="search-bar">
@@ -82,7 +85,7 @@ import AppWrapperEmpty from "@/components/app-wrapper-empty";
 import CommodityStock from "../components/CommodityStock";
 import { STOCK_TYPE } from "@/utils/declare";
 import productMins from "@/mixins/product";
-
+import { mapGetters } from 'vuex'
 export default {
 	name: "stock_manage", // 开单
 	components: {
@@ -117,7 +120,8 @@ export default {
 	computed: {
 		pageType() {
 			return this.tabs[this.tabIndex].key;
-		}
+		},
+		...mapGetters({ loginInfo: "getLoginInfo" })
 	},
 	methods: {
 		affirm(val) {

ghs/src/static/iconfont/iconfont.css

@@ -1,12 +1,13 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('//at.alicdn.com/t/font_1525256_g9h34pw8xqu.eot');
-  src: url('//at.alicdn.com/t/font_1525256_g9h34pw8xqu.eot?#iefix') format('embedded-opentype'),
-  url('//at.alicdn.com/t/font_1525256_g9h34pw8xqu.woff2') format('woff2'),
-  url('//at.alicdn.com/t/font_1525256_g9h34pw8xqu.woff') format('woff'),
-  url('//at.alicdn.com/t/font_1525256_g9h34pw8xqu.ttf') format('truetype'),
-  url('//at.alicdn.com/t/font_1525256_g9h34pw8xqu.svg#iconfont') format('svg');
+  src: url('//at.alicdn.com/t/font_1525256_6bxwphhntqh.eot');
+  src: url('//at.alicdn.com/t/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
+  url('//at.alicdn.com/t/font_1525256_6bxwphhntqh.woff2') format('woff2'),
+  url('//at.alicdn.com/t/font_1525256_6bxwphhntqh.woff') format('woff'),
+  url('//at.alicdn.com/t/font_1525256_6bxwphhntqh.ttf') format('truetype'),
+  url('//at.alicdn.com/t/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
 }
+
 .iconfont {
   font-family: "iconfont" !important;
   font-size: 16px;
@@ -14,6 +15,10 @@
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
+.iconcachu::before {
+  content: "\e7e6";
+}
+
 .iconjihuo:before {
   content: "\e601";
 }