commit - m

common/config/config.js

@@ -2,9 +2,9 @@ let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
 	// URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
-	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
+	URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
-	URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+	// URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境

common/config/wxLogin.js

@@ -36,6 +36,8 @@ const wxLoginQuick = function(){// 根据微信的code获取用户登录状态:1
 					uni.setStorageSync('sessionid','JSESSIONID='+response.data.sessionId)
 					if(response.data.userIdentity ==1){
 						uni.navigateTo({url:'/seller/pages/index/index'})
+					}else if(response.data.userIdentity === 3){
+						uni.navigateTo({url:'/supplier/pages/index/index'})
 					}else{
 						uni.switchTab({url:'/pages/tabBar/user/user'})
 					}

common/css/iconfont.scss

@@ -4,7 +4,7 @@
 	font-family: iconfont;
 	font-weight: normal;
 	font-style: normal;
-	src: url('https://at.alicdn.com/t/font_1519039_m4qos4oii1.ttf') format('truetype');
+	src: url('https://at.alicdn.com/t/font_1519039_7v4vlb8huxo.ttf') format('truetype');
 }
 .iconfont {
 	font-family: "iconfont" !important;
@@ -13,6 +13,38 @@
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
 }
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-zaicigoumai:before {
+  content: "\e6ee";
+}
+
+.icon-shengjihuiyuanjigou:before {
+  content: "\e6ec";
+}
+
+.icon-lajigoushangxian:before {
+  content: "\e6ea";
+}
+
+.icon-bangjigouxiadan:before {
+  content: "\e6e7";
+}
+
+.icon-jigouliebiao:before {
+  content: "\e6e6";
+}
+
+.icon-yaoqingyunyingrenyuan:before {
+  content: "\e6e5";
+}
+
 .icon-zhanghuyuemingxi1:before {
   content: "\e6e4";
 }
@@ -440,3 +472,4 @@
 .icon-wodebeifenx:before {
   content: "\e611";
 }
+

components/cm-module/cm-seller/user.vue

@@ -84,6 +84,7 @@
 			<view class="foot-list">
 				<view class="list-cell-item">
 					<view class="list-cell"  v-for="(item, index) in firstList" :key="index" @click="navigator(item.path)" hover-class="cell-hover" :hover-stay-time="50">
+						<text class="cell-icon"><text class="iconfont" :class="item.icon"></text></text>
 						<text class="cell-tit">{{item.name}}</text>
 						<text 	v-if="index == 0 && orderNum >0"
 								class="uni-badge uni-badge-error uni-small uni-badge--small icon-num">
@@ -133,10 +134,10 @@
 				refundsCount:'', //退货/款角标
 				institutionsCont:120,
 				firstList:[
-					{name:'机构列表',path:'/seller/pages/club/list'},
-					{name:'帮机构下单',path:'/seller/pages/club/club-list'},
-					{name:'拉机构上线',path:'/seller/pages/login/register'},
-					{name:'邀请运营人员',path:'/seller/pages/club/allClub-list'}
+					{name:'机构列表',path:'/seller/pages/club/list',icon:'icon-jigouliebiao'},
+					{name:'帮机构下单',path:'/seller/pages/club/club-list',icon:'icon-bangjigouxiadan'},
+					{name:'拉机构上线',path:'/seller/pages/login/register',icon:'icon-lajigoushangxian'},
+					{name:'邀请运营人员',path:'/seller/pages/club/allClub-list',icon:'icon-yaoqingyunyingrenyuan'}
 				],
 			}
 		},
@@ -389,7 +390,7 @@
 			float: right;
 			line-height: 80rpx;
 			font-size: $font-size-24;
-			color: $text-color;
+			color: #666666;
 			padding-right: 30rpx;
 		}
 		.iconfont{
@@ -472,10 +473,20 @@
 		&.cell-hover{
 			background:#fafafa;
 		}
+		.cell-icon{
+			width: 60rpx;
+			height: 100rpx;
+			line-height: 100rpx;
+			text-align: center;
+			.iconfont{
+				font-size: $font-size-34;
+				color: #666666;
+			}
+		}
 		.cell-more{
 			align-self: baseline;
 			font-size:$font-size-28;
-			color:$text-color;
+			color:#666666;
 			.txt{
 				color: #FB4343;
 				padding-right: 10rpx;
@@ -484,7 +495,7 @@
 		.cell-tit{
 			flex: 1;
 			font-size: $font-size-28;
-			color: $text-color;
+			color: #666666;
 			margin-right:10rpx;
 		}
 		.cell-tip{

components/cm-module/orderDetails/supplierDetaileButton.vue

@@ -1,12 +1,12 @@
 <template name="button">
 	<view class="button-template clearfix" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
 		<!-- 底部按钮 -->
+		<view class="btn btn-color" v-if="btnState.isDeliver"  @click.stop="btnConfirm('deliver')">发货</view>
 		<view class="btn btn-cancel" @click.stop="onShareCode">
 			<view class="tips" v-if="shareCode">分享码：{{shareCode}}</view>
 			分享订单
 		</view>	
 		<view class="btn btn-cancel" @click.stop="btnConfirm('record')">发货记录</view>
-		<view class="btn btn-color" v-if="btnState.isDeliver"  @click.stop="btnConfirm('deliver')">发货</view>
 	</view>
 </template>
 

components/cm-module/orderDetails/supplierListButton.vue

@@ -1,12 +1,12 @@
 <template name="button">
 	<view class="button-template clearfix">
 		<!-- 底部按钮 -->
+		<view class="btn btn-color" v-if="btnState.isDeliver"  @click.stop="btnConfirm('deliver',orderInfo)">发货</view>
 		<view class="btn btn-cancel" @click.stop="onShareCode(orderInfo.shopOrderID)">
 			<view class="tips" v-if="shareCode">分享码：{{shareCode}}</view>
 			分享订单
 		</view>	
 		<view class="btn btn-cancel" @click.stop="btnConfirm('record',orderInfo)">发货记录</view>
-		<view class="btn btn-color" v-if="btnState.isDeliver"  @click.stop="btnConfirm('deliver',orderInfo)">发货</view>
 	</view>
 </template>
 

pages/goods/goods-secondary.vue

@@ -295,7 +295,7 @@
 		width: 100%;
 		height: 318rpx;
 		float: left;
-		margin-bottom: 10rpx;
+		margin-bottom:20rpx;
 		position: relative;
 		.list-image{
 			width: 100%;
@@ -338,7 +338,7 @@
 			top: 0;
 			left: 0;
 			z-index: 9999;
-			background: rbba(255,255,255,.6);
+			background: rgba(0,0,0,.1);
 			border-radius: 2rpx;
 			display: flex;
 			flex-direction: column;

pages/goods/product.vue

@@ -694,7 +694,7 @@
 			if(!this.tabSelectFlag) {
 				this.activeTab(scrollTop, this);
 			}
-			if(e.scrollTop>50){
+			if(e.scrollTop>100){
 				this.headerColor = true
 				this.navbarFiexd = 'fixed'
 				this.nvabarData={							

pages/login/bindwechat.vue

@@ -251,11 +251,12 @@
 			}
 		}
 		.login-form{
-			width: 702rpx;
+			width: 100%;
 			height: auto;
-			padding: 0 24rpx;
+			padding: 0 30rpx;
+			box-sizing: border-box;
 			.login-input{
-				width: 654rpx;
+				width: 100%;
 				height: 40rpx;
 				padding: 24rpx 0;
 				margin-bottom: 20rpx;

pages/tabBar/user/user.vue

@@ -102,6 +102,7 @@
 			<view class="foot-list">
 				<view class="list-cell-item" v-show="hasLogin">
 					<view class="list-cell" v-show="userIdentity == 4" @click="navigator(`/pages/login/apply?clubStatus=${clubStatus}`)" hover-class="cell-hover" :hover-stay-time="50">
+						<text class="cell-icon"><text class="iconfont icon-shengjihuiyuanjigou"></text></text>
 						<text class="cell-tit">升级会员机构</text>
 						<text class="cell-more">
 							<text class="txt">{{clubStatusText(clubStatus)}}</text>
@@ -109,6 +110,7 @@
 						</text>
 					</view>
 					<view class="list-cell" @click="navigator('/pages/user/regularPurchase/regularPurchase')" hover-class="cell-hover" :hover-stay-time="50">
+						<text class="cell-icon"><text class="iconfont icon-zaicigoumai"></text></text>
 						<text class="cell-tit">再次购买</text>
 						<text class="cell-more iconfont icon-xiayibu"></text>
 					</view>

pages/user/operator/addoperator.vue

@@ -96,12 +96,12 @@
 				height: auto;
 				.from-row{
 					height: 40rpx;
-					padding: 24rpx 40rpx;
-					background: #F7F7F7;
-					border-radius: 44rpx;
+					padding: 24rpx 0;
+					background: #FFFFFF;
 					margin-bottom: 40rpx;
 					font-size: $font-size-28;
 					color: $text-color;
+					border-bottom: 1px solid #E1E1E1;
 					.input{
 						width: 100%;
 						height: 100%;

services/ajax.env.js

@@ -2,9 +2,9 @@ let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
 	// URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
-	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
+	URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
-    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+    // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境

supplier/pages/deliver/deliver-goods.vue

@@ -366,6 +366,7 @@
 							text-align: center;
 							line-height: 48rpx;
 							font-weight: bold;
+							background-color: #ffe6dc;
 							&.disabled{
 								color: #999999;
 							}
@@ -442,7 +443,7 @@
 		bottom: 0rpx;
 		z-index: 100;
 		.footer-le{
-			width: 490rpx;
+			width: 450rpx;
 			height: 100%;
 			padding:0 30rpx;
 			float: left;
@@ -508,21 +509,24 @@
 		}
 		.footer-ri{
 			width: 200rpx;
-			height: 100%;
+			height: 64rpx;
 			background:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
 			float: right;
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
 			z-index: 999;
+			margin-top: 20rpx;
+			margin-right: 24rpx;
+			border-radius: 32rpx;
 			&.none{
 				display: none;
 			}
 			.btn{
 				width: 200rpx;
-				height: 100%;
+				height: 64rpx;
 				font-size: $font-size-28;
-				line-height: 110rpx;
+				line-height: 64rpx;
 				color: #FFFFFF;
 				display: flex;
 				justify-content: center;

supplier/pages/order/order-list.vue

@@ -25,11 +25,11 @@
 							</view>
 							<view class="order-title-t first">
 								<view class="order-title-num">订单编号：{{ order.shopOrderNo }}</view>
-								<view class="order-title-tip">结算状态: {{ order.payStatus | payStatusType }}</view>
+								<view class="order-title-tip">结算状态：{{ order.payStatus | payStatusType }}</view>
 							</view>
 							<view class="order-title-t">
 								<view class="order-title-num">下单时间：{{ order.orderTime }}</view>
-								<view class="order-title-tip">发货状态: <text class="status">{{ order.sendOutStatus | sendOutStatusType }}</text></view>
+								<view class="order-title-tip">发货状态：<text class="status">{{ order.sendOutStatus | sendOutStatusType }}</text></view>
 							</view>
 						</view>
 						<view class="order-product">
@@ -40,19 +40,19 @@
 									</view>
 									<view class="pros-product-msg">
 										<view class="name">{{ pros.name }}</view>
-										<view class="unit">规格:{{ pros.productUnit }}</view>
+										<view class="unit">规格：{{ pros.productUnit }}</view>
 										<view class="price">
 											<view class="red">¥{{ pros.price | NumFormat}}</view>
 											<view class="count">X{{ pros.num }}</view>
 										</view>
 										<view class="number">
-											<text>已发货:{{ pros.shipmentsNum }}</text>
-											<text v-if="order.returnedNum!=null&&order.returnedNum!=0">已退货:{{ pros.actualCancelNum }}</text>
-											<text v-if="order.returnedNum!=null&&order.returnedNum!=0">取消:{{ pros.actualCancelNum }}</text>
+											<text>已发货：{{ pros.shipmentsNum }}</text>
+											<text v-if="order.returnedNum!=null&&order.returnedNum!=0">已退货：{{ pros.actualCancelNum }}</text>
+											<text v-if="order.returnedNum!=null&&order.returnedNum!=0">取消：{{ pros.actualCancelNum }}</text>
 										</view>
 									</view>
 								</view>
-								<view class="pros-product-uss">合计:<text>¥{{ pros.price | NumFormat}}</text></view>
+								<view class="pros-product-uss">合计：<text class="text">¥{{ pros.price | NumFormat}}</text></view>
 							</view>
 						</view>
 						<!-- 底部button -->
@@ -72,13 +72,13 @@
 		<!--右抽屉-->
 		<tui-drawer mode="right" :visible="rightDrawer" @close="closeDrawer">
 			<view class="d-container clearfix" :style="{paddingTop:20+'px'}">
-				<view class="d-label">商品货号:</view>
+				<view class="d-label">订单编号:</view>
 				<view class="d-input">
 					<input class="input" type="text" value="" v-model="listQuery.shopOrderNo" placeholder="输入订单编号"/>
 				</view>
-				<view class="d-label">商品货号:</view>
+				<view class="d-label">收货人姓名:</view>
 				<view class="d-input">
-					<input class="input" type="text" value="" v-model="listQuery.name" placeholder="输入收货人"/>
+					<input class="input" type="text" value="" v-model="listQuery.name" placeholder="输入收货人姓名"/>
 				</view>
 				<view class="d-label">结算状态:</view>
 				<view class="d-input">
@@ -256,6 +256,7 @@
 			handButtonConfirm(data) {//获取点击
 				console.log(data)
 				this.btnoRderID = data.orderInfo.shopOrderID
+				console.log(this.btnoRderID )
 				this.OperationType = data.type
 				this.handShowAlert(data)
 			},
@@ -265,8 +266,7 @@
 						this.$api.navigateTo('/supplier/pages/deliver/deliver-record?shopOrderId='+this.btnoRderID)
 						break
 					case 'deliver':
-						this.$api.setStorage('shopOrderId',this.btnoRderID)
-						this.$api.navigateTo('/supplier/pages/deliver/deliver-goods')
+						this.$api.navigateTo('/supplier/pages/deliver/deliver-goods?shopOrderId='+this.btnoRderID)
 						break
 				}
 			},
@@ -278,16 +278,12 @@
 				this.rightDrawer = false;
 			},
 			bindPickerChange: function(e) {//选择结算状态筛选
-				console.log(e)
 				this.showSendOutStatus = this.StatusArray[e.target.value].name
 				this.listQuery.sendOutStatus = this.StatusArray[e.target.value].value
-				console.log(this.listQuery.sendOutStatus )
 			},
 			bindPickerChange1: function(e) {//选择发货状态筛选
-				console.log(e)
 				this.showpayStatus = this.PayArray[e.target.value].name
 				this.listQuery.payStatus = this.PayArray[e.target.value].value
-				console.log(this.listQuery.payStatus )
 			},
 			handSearchList(){//搜索
 				this.getOrderDatainit()
@@ -295,8 +291,12 @@
 				this.rightDrawer = false;
 			},
 			handSearchClear(){//重置搜索条件
-				
-			}
+				this.listQuery = Object.assign({}, defaultListQuery)
+				this.showSendOutStatus='';
+				this.showpayStatus='';
+				this.listQuery.shopOrderNo='';
+				this.listQuery.name='';
+			},
 		},
 		onShareAppMessage(res){//分享转发
 			this.isShareModal = false
@@ -673,6 +673,7 @@
 				font-weight: bold;
 				text{
 					color: #f94b4b;
+					margin-left: 10rpx;
 				}
 			}
 		}

supplier/pages/user/my-product.vue

@@ -6,8 +6,8 @@
 				<view class="ortext" @click="searchClickFn">筛选</view>
 			</view>
 			<view class="superv-header-checked" v-else>
-				<view class="oltext">
-					<view class="checkbox iconfont" :class="[isAllChecked ?'icon-yixuanze':'icon-weixuanze']" @click="isCheckedAll"></view>
+				<view class="oltext" @click="isCheckedAll">
+					<view class="checkbox iconfont" :class="[isAllChecked ?'icon-yixuanze':'icon-weixuanze']"></view>
 					<view class="text">全选</view>
 				</view>
 				<view class="ortext" @click="closeSupervFn">完成</view>
@@ -32,7 +32,7 @@
 									<view class="tui-goods-image">
 										<image :src="item.mainImage" class="tui-goods-img"/>
 									</view>
-									<view class="tui-goods-info"> 
+									<view class="tui-goods-info" :style="{width:isSuperv ? '360rpx' : '420rpx'}"> 
 										<view class="tui-goods-title">{{ item.name }}</view>
 										<view class="tui-price-box">
 											<view class="tui-goods-price">￥{{item.price1 | NumFormat}}</view>
@@ -636,12 +636,15 @@
 			height: 80rpx;
 			font-size: $font-size-30;
 			.oltext{
+				width: 120rpx;
 				float: left;
 				color: #666666;
 			}
 			.ortext{
+				width: 120rpx;
 				float: right;
 				color: $color-system;
+				text-align: right;
 			}
 		}
 		.superv-header-checked{
@@ -649,6 +652,7 @@
 			height: 80rpx;
 			font-size: $font-size-30;
 			.oltext{
+				width: 120rpx;
 				float: left;
 				color: #666666;
 				display: flex;
@@ -677,8 +681,10 @@
 				}
 			}
 			.ortext{
+				width: 120rpx;
 				float: right;
 				color: $color-system;
+				text-align: right;
 			}
 		}
 	}
@@ -983,7 +989,6 @@
 		}
 	}
 	.tui-goods-info {
-		width: 360rpx;
 		padding-left: 20rpx;
 		display: flex;
 		flex-direction: column;

supplier/pages/user/operator/addoperator.vue

@@ -91,12 +91,13 @@
 				height: auto;
 				.from-row{
 					height: 40rpx;
-					padding: 24rpx 40rpx;
-					background: #F7F7F7;
+					padding: 24rpx 0;
+					background: #FFFFFF;
 					border-radius: 44rpx;
 					margin-bottom: 40rpx;
 					font-size: $font-size-28;
 					color: $text-color;
+					border-bottom: 1px solid #E1E1E1;
 					.input{
 						width: 100%;
 						height: 100%;

supplier/pages/user/setting/password.vue

@@ -312,9 +312,9 @@
 			margin: auto;
 			border-bottom: 2rpx solid #e1e1e1;
 			.login-input{
-				width: 654rpx;
-				height: 40rpx;
-				padding: 24rpx;
+				width: 100%;
+				height: 60rpx;
+				padding: 24rpx 0;
 				border-radius: 14rpx;
 				display: flex;
 				flex-direction: column;
@@ -346,7 +346,7 @@
 					background: $btn-confirm;
 					padding: 0;
 					border-radius: 44rpx;
-					margin-top: 10rpx;
+					margin-top: 20rpx;
 					.input{
 						width: 220rpx;
 						height: 64rpx;
@@ -375,6 +375,7 @@
 					float: right;
 					background: #FFFFFF;
 					display: block;
+					margin-top: 10rpx;
 					.vscodeimg{
 						width: 160rpx;
 						height: 64rpx;