Merge branch 'master' of http://git.caimei365.com/caimei-repository/caimei-applets-caimei

.gitignore

@@ -1 +1,3 @@
-unpackage/
+unpackage/
+.gitignore
+/common/config/config.js

api/product.js

@@ -29,7 +29,7 @@ export function queryGoodscategory() {
  */
 export function queryGoodslist(url,params) {
 	return new Promise(function(resolve,reject) {
-		request.get(url,params, res => {
+		request.lodingGet(url,params, res => {
 			if(res.code == 0){
 				resolve(res);
 			}else{

common/config/caimeiApi.js

@@ -23,7 +23,8 @@ const caimeiApi = {
 			method: 'GET',
 			success: (response) => {
 				if(response.statusCode !== 200){
-					uni.showToast({icon: 'none',title:'网络链接超时',duration: 2000})
+					uni.showToast({icon: 'none',title:'服务器连接错误',duration: 2000})
+					callback(response.statusCode);
 				}else{
 					callback(response.data);
 				}
@@ -54,7 +55,8 @@ const caimeiApi = {
 			method: 'GET',
 			success: (response) => {
 				if(response.statusCode !== 200){
-					uni.showToast({icon: 'none',title: '网络链接超时',duration: 2000})
+					uni.showToast({icon: 'none',title: '服务器连接错误',duration: 2000})
+					callback(response.statusCode);
 				}else{
 					callback(response.data);
 				}

common/config/config.js

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

components/module/home/navigationTab.vue → components/cm-module/home/navigationTab.vue

@@ -1,9 +1,9 @@
 <template name="navigation">
 	<!-- 自定义分类导航栏 -->
 	<view class="tabbar clearfix">
-		<view class="cate-item" v-for="(nav,idx) in navList" :key="idx" @click="navToListPage(nav)">
-			<image :src="nav.classifyImage"></image>
-			<text>{{nav.classifyName}}</text>
+		<view class="cate-item" v-for="(nav,idx) in tabList" :key="idx" @click.stop="navToListPage(nav)">
+			<image class="tui-skeleton-fillet" :src="nav.classifyImage"></image>
+			<text class="tui-skeleton-rect">{{nav.classifyName}}</text>
 		</view>
 	</view>
 </template>
@@ -13,7 +13,7 @@
 	export default{
 		name:'navigation',
 		props:{
-		    navList: { // 由父页面传递的数据
+		    tabList: { // 由父页面传递的数据
 				type: Array,
 				value: [],
 		    },
@@ -25,6 +25,7 @@
 			}
 		},
 		created() {
+			
 		},
 		onLoad(){
 			
@@ -47,7 +48,6 @@
 	.cate-item {
 		width: 118rpx;
 		margin-right:28rpx;
-		margin-bottom:28rpx;
 		display: flex;
 		float: left;
 		flex-direction: column;
@@ -65,6 +65,7 @@
 			width: 90rpx;
 			height: 90rpx;
 			margin-bottom: 8rpx;
+			border-radius: 50%;
 		}	
 	}
 </style>

components/module/listTemplate/buyagainList.vue → components/cm-module/listTemplate/buyagainList.vue

@@ -52,7 +52,7 @@
 </template>
 
 <script>
-	import listSkeleton from '@/components/module/listTemplate/listSkeleton'
+	import listSkeleton from '@/components/cm-module/listTemplate/listSkeleton'
 	import modalLayer from "@/components/modal-layer"
 	import uniStars from '@/components/uni-stars/uni-stars.vue'
 	import { queryAgaingoodslist } from "@/api/product.js"

components/module/listTemplate/commodityList.vue → components/cm-module/listTemplate/commodityList.vue

@@ -50,7 +50,7 @@
 </template>
 
 <script>
-	import listSkeleton from '@/components/module/listTemplate/listSkeleton'
+	import listSkeleton from '@/components/cm-module/listTemplate/listSkeleton'
 	import modalLayer from "@/components/modal-layer"
 	import uniStars from '@/components/uni-stars/uni-stars.vue'
 	import { queryGoodslist } from "@/api/product.js"
@@ -116,6 +116,16 @@
 				this.scrollHeight = windowHeight - 1;
 			},
 			getListFromServer(loadMore) {
+				this.$api.getStorage().then((resolve) =>{
+					this.userID = resolve.userID ? resolve.userID : '';
+					console.log('22222222222222')
+					this.getQueryGoodslist(loadMore)
+				}).catch(resolve =>{
+					console.log('22222222222222')
+					this.getQueryGoodslist(loadMore)
+				})
+			},
+			getQueryGoodslist(loadMore){
 				let self = this;
 				const thisServerurl = self.$parent.serverUrl;
 				self.showLoading = true;
@@ -127,48 +137,44 @@
 				if(self.$parent.lastPageType === '再次购买') {
 					self.fromRegularPurchasePage = true;
 				}
-				this.$api.getStorage().then((resolve) =>{
-					this.userID = resolve.userID ? resolve.userID : '';
-					queryGoodslist(thisServerurl,{userId:this.userID,pageNum:self.pageNum,pageSize:self.pageSize}).then(response=>{
-						const resData = self.fromRegularPurchasePage ?response.data.page :response.data;
-						const resList = resData.results,
-							  getCartNum = response.data.count;
-						this.cartNum = getCartNum > 99 ?'99+' :getCartNum;
-						if(!loadMore && self.fromRegularPurchasePage && resData.hasNextPage) {
-							self.showRegularBtn = true;
+				queryGoodslist(thisServerurl,{userId:this.userID,pageNum:self.pageNum,pageSize:self.pageSize}).then(response=>{
+					const resData = self.fromRegularPurchasePage ?response.data.page :response.data;
+					const resList = resData.results,
+						  getCartNum = response.data.count;
+					this.cartNum = getCartNum > 99 ?'99+' :getCartNum;
+					if(!loadMore && self.fromRegularPurchasePage && resData.hasNextPage) {
+						self.showRegularBtn = true;
+					}
+					if(resList && resList.length > 0){
+						self.hasNextPage = resData.hasNextPage;
+						self.totalPage = resData.totalPage;
+						if(loadMore) {
+							self.commodityList = [...self.commodityList,...resList];
+							self.showRegularBtn = false;
+						} else {
+							self.commodityList = [...resList];
+							self.showSkeleton = false;
 						}
-						if(resList && resList.length > 0){
-							self.hasNextPage = resData.hasNextPage;
-							self.totalPage = resData.totalPage;
-							if(loadMore) {
-								self.commodityList = [...self.commodityList,...resList];
-								self.showRegularBtn = false;
-							} else {
-								self.commodityList = [...resList];
-								self.showSkeleton = false;
-							}
-							// 防上拉暴滑
-							self.pullFlag = false;
-							setTimeout(()=>{
-								self.pullFlag = true;
-							},500)
-							// 底部提示文案
-							if(self.hasNextPage) {
-								self.loadingText = '上拉加载更多';
-							} else {
-								self.showLoading = true;
-								self.loadingNow = false;
-							}
+						// 防上拉暴滑
+						self.pullFlag = false;
+						setTimeout(()=>{
+							self.pullFlag = true;
+						},500)
+						// 底部提示文案
+						if(self.hasNextPage) {
+							self.loadingText = '上拉加载更多';
 						} else {
-							if(!loadMore) {
-								self.showEmpty = true;
-							}
+							self.showLoading = true;
+							self.loadingNow = false;
+						}
+					} else {
+						if(!loadMore) {
+							self.showEmpty = true;
 						}
-					}).catch(response =>{
-						this.$util.msg(response.msg,2000);
-					})
+					}
+				}).catch(response =>{
+					this.$util.msg(response.msg,2000);
 				})
-				
 			},
 			operationHanld(prop){
 				this.$emit('operationConfim',prop)

components/module/listTemplate/immediatelyList.vue → components/cm-module/listTemplate/immediatelyList.vue

@@ -68,7 +68,7 @@
 </template>
 
 <script>
-	import listSkeleton from '@/components/module/listTemplate/listSkeleton'
+	import listSkeleton from '@/components/cm-module/listTemplate/listSkeleton'
 	import modalLayer from "@/components/modal-layer"
 	import uniStars from '@/components/uni-stars/uni-stars.vue'
 	import { getSellerProduct  } from "@/api/seller.js"

components/module/listTemplate/memberList.vue → components/cm-module/listTemplate/memberList.vue

@@ -34,7 +34,7 @@
 </template>
 
 <script>
-	import listSkeleton from '@/components/module/listTemplate/listSkeleton'
+	import listSkeleton from '@/components/cm-module/listTemplate/listSkeleton'
 	import { queryMember } from "@/api/other.js"
 	export default {
 		name:'MemberList',

components/module/listTemplate/productList.vue → components/cm-module/listTemplate/productList.vue

@@ -54,7 +54,7 @@
 </template>
 
 <script>
-	import listSkeleton from '@/components/module/listTemplate/listSkeleton'
+	import listSkeleton from '@/components/cm-module/listTemplate/listSkeleton'
 	import modalLayer from "@/components/modal-layer"
 	import uniStars from '@/components/uni-stars/uni-stars.vue'
 	import { queryAgaingoodslist } from "@/api/product.js"

components/module/productDetails/evaluate.vue → components/cm-module/productDetails/evaluate.vue

@@ -147,7 +147,7 @@
 		height: 100rpx;
 		line-height: 100rpx;
 		padding: 0 24rpx;
-		font-size: $font-size-32;
+		font-size: $font-size-28;
 		color: #999999;
 		text-align: center;
 	}

components/module/productDetails/productDetails.vue → components/cm-module/productDetails/productDetails.vue

@@ -66,8 +66,8 @@
 </template>
 
 <script>
-	import popupGoods from '@/components/module/popupGoods/popupGoods.vue' //底部确认选择商品及数量弹窗
-	import bottomMenu from '@/components/module/bottomMenu/bottomMenu.vue' //底部按钮	
+	import popupGoods from '@/components/cm-module/popupGoods/popupGoods.vue' //底部确认选择商品及数量弹窗
+	import bottomMenu from '@/components/cm-module/bottomMenu/bottomMenu.vue' //底部按钮	
 	export default{
 		components:{
 			popupGoods,

components/module/productDetails/recommend.vue → components/cm-module/productDetails/recommend.vue

@@ -133,7 +133,7 @@
 		height: 100rpx;
 		line-height: 100rpx;
 		padding: 0 24rpx;
-		font-size: $font-size-32;
+		font-size: $font-size-28;
 		color: #999999;
 		text-align: center;
 	}

components/seller/home.vue

@@ -7,39 +7,44 @@
 				<bt-search :clickPath="clickPath" :toestText='hotSearchText'></bt-search>
 			</view>
 			<view class="banner-section">
-				<!-- <uni-swiper-dot :info="bannerList" :current="current" field="content" :mode="mode" > -->
-				<swiper class="banner tui-banner tui-skeleton-rect" circular @change="swiperChange" :autoplay="true" :interval="5000" :duration="500" :circular="false">
+				<swiper class="banner tui-banner tui-skeleton-rect" circular @change="swiperChange" :autoplay="true" :interval="5000" :duration="500" :circular="true">
 					<swiper-item v-for="(item, index) in bannerImageList" :key="index" class="banner-item"> 
 						<image :src="item" />
 					</swiper-item>
 				</swiper>
 				<view class="swiper__dots-box" v-if="bannerImageList.length > 1">
-					<view v-for="(item,idx) in bannerImageList" 
-						  :key="idx" 
+					<view v-for="(item,idx) in bannerImageList" :key="idx" 
 						  :class="[idx===current?'swiper__dots-long':'none']" 
-						  :data-index="current" class="swiper__dots-item" />
+						  :data-index="current" class="swiper__dots-item">
+					</view>	  
 				</view>
-				<!-- </uni-swiper-dot> -->
 			</view>
 			<view class="cate-section clearfix">
+				<!-- 自定义分类导航栏 -->
+				<view class="tabbar clearfix">
+					<view class="cate-item" v-for="(nav,idx) in productsClassifyList" :key="idx" @click.stop="navToListPage(nav)">
+						<image class="tui-skeleton-circular" :src="nav.classifyImage"></image>
+						<text class="tui-skeleton-rect">{{nav.classifyName}}</text>
+					</view>
+				</view>
 				<!-- 优选分类 -->
 				<view class="tabbar clearfix">
 					<view class="cate-item-info" @click.stop="this.$api.navToListPage({type:'1',value:firstModulesName})">
-						<image class="tui-skeleton-fillet" :src="firstModulesImage"></image>
+						<image class="tui-skeleton-circular" :src="firstModulesImage"></image>
 						<text class="tui-skeleton-fillet">{{firstModulesName}}</text>
 					</view>
 					<view class="cate-item-info" @click.stop="this.$api.navToListPage({type:'2',value:secondModulesName})">
-						<image class="tui-skeleton-fillet" :src="secondModulesImage"></image>
+						<image class="tui-skeleton-circular" :src="secondModulesImage"></image>
 						<text class="tui-skeleton-fillet">{{secondModulesName}}</text>
 					</view>
 					<view class="cate-item-info" @click="showTost">
-						<image class="tui-skeleton-fillet" :src="navInforList[0].icon"></image>
+						<image class="tui-skeleton-circular" :src="navInforList[0].icon"></image>
 						<text class="tui-skeleton-fillet">{{navInforList[0].text}}</text>
 					</view>
 					<view class="cate-item-info">
 						<!-- #ifdef MP-WEIXIN -->
 						<button class="contact-btn" open-type="contact" @bindcontact="handleContact">
-							<image class="tui-skeleton-fillet" :src="navInforList[1].icon"></image>
+							<image class="tui-skeleton-circular" :src="navInforList[1].icon"></image>
 						</button>	
 						<!-- #endif -->
 						<text class="tui-skeleton-fillet">{{navInforList[1].text}}</text>
@@ -127,6 +132,7 @@
 
 <script>
 	import tuiSkeleton from "@/components/tui-skeleton/tui-skeleton"
+	import navigationTab from "@/components/cm-module/home/navigationTab.vue"
 	import authorize from '@/common/config/authorize.js'
 	import modalLayer from "@/components/modal-layer"
 	import btSearch from '@/components/uni-search/bt-search.vue'
@@ -137,6 +143,7 @@
 	export default {
 		components:{
 			tuiSkeleton,
+			navigationTab,
 			modalLayer,
 			btSearch,
 			uniStars,
@@ -161,14 +168,21 @@
 				bannerImageList:[],
 				skeletonShow: true,
 				organizeProducts:[],//常用商品
+				productsClassifyList:[
+					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/icon-vip%403x.png',classifyName:'采美采购'},
+					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/icon-vip%403x.png',classifyName:'采美采购'},
+					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/icon-vip%403x.png',classifyName:'采美采购'},
+					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/icon-vip%403x.png',classifyName:'采美采购'},
+					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/icon-vip%403x.png',classifyName:'采美采购'}
+				],//分类导航
 				firstModulesName:'https://img.caimei365.com/group1/M00/03/8C/Cmis215XHXSAAZU0AACaPrfbB8I435.png', //优惠模块1
 				secondModulesName:'', //优惠模块2
 				firstModulesImage:'https://img.caimei365.com/group1/M00/03/8C/Cmis215XHXSAAZU0AACaPrfbB8I435.png',//优惠模块icon1
 				secondModulesImage:'',//优惠模块icon2
 				thirdModulesName:'', //优惠模块3
 				navInforList:[
-					{text:'会员中心',icon:'https://img.caimei365.com/group1/M00/03/8C/Cmis215XHXSAAZU0AACaPrfbB8I435.png'},
-					{text:'在线客服',icon:'https://img.caimei365.com/group1/M00/03/8D/Cmis215XHXWABv0rAACt9b8scec656.png'}
+					{text:'会员中心',icon:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/icon-vip%403x.png'},
+					{text:'在线客服',icon:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/icon-kefu%403x.png'}
 				],
 				navServerList:[
 					{text:'会员优惠',icon:'../../static/temp/server1@2x.png',path:'/pages/service/member'},
@@ -193,6 +207,7 @@
 				queryHomeInfo({}).then(res =>{
 					let data = res.data;
 					this.bannerImageList = data.bannerImageList
+					this.productsClassifyList = data.productsClassifyList
 					this.mallPageModules = data.mallPageModules
 					this.firstModulesName= data.firstModulesName
 					this.secondModulesName= data.secondModulesName
@@ -229,7 +244,7 @@
 					key: 'commodity_id',
 					data: nav.id,
 					success: function () {
-						self.$api.navToListPage({type:'商品分类',value:nav.classifyName,id:nav.id});
+						self.$api.navToListPage({type:'导航分类',value:nav.classifyName,id:nav.id});
 					}
 				})
 			},
@@ -252,7 +267,6 @@
 				// 	success(res) {
 				// 		console.log(res)
 				// 		// 打开成功
-						
 				// 	}
 				// })
 			},
@@ -361,7 +375,6 @@
 		.cate-item {
 			width: 118rpx;
 			margin-right:28rpx;
-			margin-bottom:28rpx;
 			display: flex;
 			float: left;
 			flex-direction: column;
@@ -379,11 +392,12 @@
 				width: 90rpx;
 				height: 90rpx;
 				margin-bottom: 8rpx;
+				border-radius: 50%;
 			}	
 		}
 		.cate-item-info {
-			width: 160rpx;
-			margin-right:20.666rpx;
+			width: 118rpx;
+			margin-right:76.5rpx;
 			display: flex;
 			float: left;
 			flex-direction: column;
@@ -395,12 +409,13 @@
 				margin-right: 0;
 			}
 			image {
-				width: 160rpx;
+				width: 90rpx;
 				height: 90rpx;
 				margin-bottom: 16rpx;
+				border-radius:50%;
 			}	
 			button.contact-btn{
-				width: 160rpx;
+				width: 118rpx;
 				height: 90rpx;
 				margin: 0;
 				padding: 0;
@@ -416,46 +431,22 @@
 				background-color:#FFFFFF;
 				margin-bottom: 16rpx;
 				image{
-					width: 160rpx;
+					width: 90rpx;
 					height: 90rpx;
 					margin-bottom: 0;
+					border-radius:50%;
 				}
 			}
 		}
 	}
-	/* 活动 */
-	.hot-section{
-		padding:0 24rpx 48rpx 24rpx; 
-		background: #FFFFFF;
-		.ht-l{
-			width: 339rpx;
-			height: 188rpx;
-			float: left;
-			image{
-				width: 339rpx;
-				height: 188rpx;
-				border-radius:10rpx;
-			}
-		}
-		.ht-r{
-			width: 339rpx;
-			height: 188rpx;
-			float: right;
-			image{
-				width: 339rpx;
-				height: 188rpx;
-				border-radius:10rpx;
-			}
-		}
-	}
 	.hotgoods-section{
 		padding: 4rpx 0 24rpx 24rpx;
 		background: #fff;
 		.s-header{
 			display:flex;
 			align-items:center;
-			height: 40rpx;
-			line-height: 40rpx;
+			height: 50rpx;
+			line-height: 50rpx;
 			.tip{
 				flex: 4;
 				font-size: 30rpx;

components/seller/user.vue

@@ -7,7 +7,7 @@
 				<view class="u-header-main">
 					<view class="user-item">
 						<view class="logo-m">
-							<image :src="headpic ? headpic:'https://img.caimei365.com/group1/M00/03/94/Cmis216Sk_OAZaxVAAANf4oruy4674.png'" mode=""></image>
+							<image :src="headpic ? headpic:'../../static/temp/icon-seller@3x.png'" mode=""></image>
 							<text class="txt tui-skeleton-fillet">协销员工</text>
 						</view>
 					</view>

components/uni-search/go-search.vue

@@ -28,7 +28,7 @@
 </template>
 
 <script>
-	import modelAlert from '@/components/module/modelAlert/modelAlert.vue'
+	import modelAlert from '@/components/cm-module/modelAlert/modelAlert.vue'
 	import authorize from '@/common/config/authorize.js'
 	export default{
 		name:"go-search",

components/uni-search/or-search.vue

@@ -30,7 +30,7 @@
 </template>
 
 <script>
-	import modelAlert from '@/components/module/modelAlert/modelAlert.vue'
+	import modelAlert from '@/components/cm-module/modelAlert/modelAlert.vue'
 	import authorize from '@/common/config/authorize.js'
 	export default{
 		name:"or-search",

market/pages/address/address.vue

@@ -49,7 +49,7 @@
 
 <script>
 	import authorize from '@/common/config/authorize.js'	
-	import modelAlert from '@/components/module/modelAlert/modelAlert.vue'
+	import modelAlert from '@/components/cm-module/modelAlert/modelAlert.vue'
 	import { queryAddressList , deleteNewAddress } from '@/api/cart.js'
 	export default {
 		components:{

market/pages/cart/buyagain.vue

@@ -39,7 +39,7 @@
 </template>
 
 <script>
-	import buyagainList from '@/components/module/listTemplate/buyagainList'
+	import buyagainList from '@/components/cm-module/listTemplate/buyagainList'
 	import { shoppingAddCart } from "@/api/cart.js" 
 	import { getSellerProductNum,shoppingCartAddCart } from "@/api/seller.js" 
 	export default{

market/pages/cart/immediately.vue

@@ -40,7 +40,7 @@
 </template>
 
 <script>
-	import immediatelyList from '@/components/module/listTemplate/immediatelyList'
+	import immediatelyList from '@/components/cm-module/listTemplate/immediatelyList'
 	import { getSellerProductNum ,shoppingCartAddCart} from "@/api/seller.js" 
 	export default{
 		components:{

market/pages/club/list.vue

@@ -212,6 +212,7 @@
 				}
 			},
 			orderHistory(item){
+				this.$api.setStorage('orderUserInfo',item)
 				this.$api.navigateTo(`/market/pages/order/order-history?clubID=${item.clubID}`)
 			},
 			onShowClose () {//输入框失去焦点时触发

market/pages/login/login.vue

@@ -28,7 +28,7 @@
 
 <script>
 	import { mapState,mapMutations } from 'vuex';
-	import errorAlert from '@/components/module/modelAlert/errorAlert.vue'
+	import errorAlert from '@/components/cm-module/modelAlert/errorAlert.vue'
 	import authorize from '@/common/config/authorize.js' 
 	import { sellerLogin } from '@/api/seller.js' 
 	import { userInfoLogin } from "@/api/use.js"
@@ -61,7 +61,7 @@
 				if(wxResponse == 1){
 					this.getWxAuthorize()
 				}else{
-					this.$api.navigateTo('/pages/authorization/authorization?type=1')
+					this.$api.navigateTo('/pages/authorization/authorization')
 					this.isSeller= true
 				}
 			})	

market/pages/order/create-order.vue

@@ -62,11 +62,11 @@
 </template>
 
 <script>
-	import choiceAddress from '@/components/module/creatOrder/sellerAddress'  
-	import goodsList from '@/components/module/creatOrder/goodsList'
-	import sellerInvoice from '@/components/module/creatOrder/sellerInvoice'
-	import sellerFreight from '@/components/module/creatOrder/sellerFreight'
-	import freightAlert from '@/components/module/modelAlert/freightAlert.vue'
+	import choiceAddress from '@/components/cm-module/creatOrder/sellerAddress'  
+	import goodsList from '@/components/cm-module/creatOrder/goodsList'
+	import sellerInvoice from '@/components/cm-module/creatOrder/sellerInvoice'
+	import sellerFreight from '@/components/cm-module/creatOrder/sellerFreight'
+	import freightAlert from '@/components/cm-module/modelAlert/freightAlert.vue'
 	import modalLayer from "@/components/modal-layer"
 	import { queryAddressList } from "@/api/cart.js" 
 	import { getOrderPostage } from "@/api/order.js" 

market/pages/order/myOrder.vue

@@ -98,17 +98,17 @@
 </template>
 
 <script>
-	import headerBack from '@/components/module/headerNavbar/header-back' 		 	 //自定义导航
+	import headerBack from '@/components/cm-module/headerNavbar/header-back' 		 	 //自定义导航
 	import tuiTabs from "@/components/tui-components/tui-tabs/tui-tabs"
 	import tuiListCell from "@/components/tui-components/list-cell/list-cell"
 	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
 	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	import orderButton from '@/components/module/orderDetails/orderListButton'		 //按钮
+	import orderButton from '@/components/cm-module/orderDetails/orderListButton'		 //按钮
 	import modalLayer from "@/components/modal-layer"
 	import empty from "@/components/empty";
-	import shareAlert from '@/components/module/modelAlert/shareAlert'			 //分享弹窗
-	import modelAlert from '@/components/module/modelAlert/modelAlert'			 //删除弹窗
-	import cancelAlert from '@/components/module/modelAlert/cancelAlert'		 //取消弹窗
+	import shareAlert from '@/components/cm-module/modelAlert/shareAlert'			 //分享弹窗
+	import modelAlert from '@/components/cm-module/modelAlert/modelAlert'			 //删除弹窗
+	import cancelAlert from '@/components/cm-module/modelAlert/cancelAlert'		 //取消弹窗
 	export default {
 		components: {
 			empty,

market/pages/order/order-details.vue

@@ -33,16 +33,16 @@
 </template>
 
 <script>
-	import headerBack from '@/components/module/headerNavbar/header-back' 		 	 //自定义导航
-	import orderAddress from '@/components/module/orderDetails/orderAddress' 		 //地址信息
-	import goodsList from '@/components/module/orderDetails/goodsList'		 		 //商品列表
-	import invoiceTent from '@/components/module/orderDetails/invoiceTent'	 		 //发票信息
-	import orderInformation from '@/components/module/orderDetails/orderInformation' //订单信息
-	import transfeRecord from '@/components/module/orderDetails/transfeRecord'		 //转账信息
-	import paymentRecord from '@/components/module/orderDetails/paymentRecord'		 //支付记录
-	import refundRecord from '@/components/module/orderDetails/refundRecord'		 //退款记录
-	import orderButton from '@/components/module/orderDetails/sellerDetaileButton'	 //底部按钮
-	import shareAlert from '@/components/module/modelAlert/shareAlert.vue'			 //分享弹窗
+	import headerBack from '@/components/cm-module/headerNavbar/header-back' 		 	 //自定义导航
+	import orderAddress from '@/components/cm-module/orderDetails/orderAddress' 		 //地址信息
+	import goodsList from '@/components/cm-module/orderDetails/goodsList'		 		 //商品列表
+	import invoiceTent from '@/components/cm-module/orderDetails/invoiceTent'	 		 //发票信息
+	import orderInformation from '@/components/cm-module/orderDetails/orderInformation' //订单信息
+	import transfeRecord from '@/components/cm-module/orderDetails/transfeRecord'		 //转账信息
+	import paymentRecord from '@/components/cm-module/orderDetails/paymentRecord'		 //支付记录
+	import refundRecord from '@/components/cm-module/orderDetails/refundRecord'		 //退款记录
+	import orderButton from '@/components/cm-module/orderDetails/sellerDetaileButton'	 //底部按钮
+	import shareAlert from '@/components/cm-module/modelAlert/shareAlert.vue'			 //分享弹窗
 	import { queryOrderDetails,cancelOrder,deleteOrder,affirmOrder } from "@/api/order.js" 
 	export default {
 		components:{

market/pages/order/order-list.vue

@@ -91,16 +91,16 @@
 </template>
 
 <script>
-	import headerBack from '@/components/module/headerNavbar/header-back' 		//自定义顶部导航
+	import headerBack from '@/components/cm-module/headerNavbar/header-back' 		//自定义顶部导航
 	import btSearch from '@/components/uni-search/bt-search.vue'				//搜索
 	import tuiSkeleton from "@/components/tui-skeleton/tui-skeleton"
 	import tuiListCell from "@/components/tui-components/list-cell/list-cell"
 	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
 	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	import orderButton from '@/components/module/orderDetails/sellerOrderButton' //操作按钮
+	import orderButton from '@/components/cm-module/orderDetails/sellerOrderButton' //操作按钮
 	import modalLayer from "@/components/modal-layer"
 	import empty from "@/components/empty";
-	import shareAlert from '@/components/module/modelAlert/shareAlert'			 //分享弹窗
+	import shareAlert from '@/components/cm-module/modelAlert/shareAlert'			 //分享弹窗
 	import { cancelOrder,deleteOrder, affirmOrder } from "@/api/order.js"
 	import { getSellerOrderList } from "@/api/seller.js" 
 	

market/pages/order/order-sharedetails.vue

@@ -22,13 +22,13 @@
 </template>
 
 <script>
-	import orderAddress from '@/components/module/orderDetails/orderAddress' 		 //地址信息
-	import goodsList from '@/components/module/orderDetails/goodsList'		 		 //商品列表
-	import invoiceTent from '@/components/module/orderDetails/invoiceTent'	 		 //发票信息
-	import orderInformation from '@/components/module/orderDetails/orderInformation' //订单信息
-	import transfeRecord from '@/components/module/orderDetails/transfeRecord'		 //转账信息
-	import paymentRecord from '@/components/module/orderDetails/paymentRecord'		 //支付记录
-	import refundRecord from '@/components/module/orderDetails/refundRecord'		 //退款记录
+	import orderAddress from '@/components/cm-module/orderDetails/orderAddress' 		 //地址信息
+	import goodsList from '@/components/cm-module/orderDetails/goodsList'		 		 //商品列表
+	import invoiceTent from '@/components/cm-module/orderDetails/invoiceTent'	 		 //发票信息
+	import orderInformation from '@/components/cm-module/orderDetails/orderInformation' //订单信息
+	import transfeRecord from '@/components/cm-module/orderDetails/transfeRecord'		 //转账信息
+	import paymentRecord from '@/components/cm-module/orderDetails/paymentRecord'		 //支付记录
+	import refundRecord from '@/components/cm-module/orderDetails/refundRecord'		 //退款记录
 	import { queryOrderDetails } from "@/api/order.js"
 	
 	export default {

market/pages/search/search-order.vue

@@ -97,10 +97,10 @@
 	import orSearch from '@/components/uni-search/or-search.vue'
 	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
 	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	import orderButton from '@/components/module/orderDetails/sellerOrderButton' //按钮
+	import orderButton from '@/components/cm-module/orderDetails/sellerOrderButton' //按钮
 	import modalLayer from "@/components/modal-layer"
 	import empty from "@/components/empty";
-	import shareAlert from '@/components/module/modelAlert/shareAlert' //分享弹窗
+	import shareAlert from '@/components/cm-module/modelAlert/shareAlert' //分享弹窗
 	import authorize from '@/common/config/authorize.js'
 	import { searchOrderInfo, searchOrderHistory,clearOrderHistory,cancelOrder,deleteOrder,affirmOrder,} from "@/api/order.js"
 	import { getSellerOrderList, } from "@/api/seller.js" 

pages/authorization/authorization.vue

@@ -5,7 +5,7 @@
 			<text class="logo-text">生美/医美采购服务平台</text>
 		</view>
 		<view class="login-content">
-			<text>您暂未授权采美采购小程序获取您的信息，将无法正常使用小程序的功能。如需正常使用，请点击“授权”按钮，并允许头像、昵称等信息的授权</text>
+			<text>您暂未授权采美采购小程序获取您的信息，将无法正常使用小程序的功能。如需正常使用，请点击“授权”按钮，并允许头像、昵称等信息的授权。</text>
 		</view>
 		<view class="login-form">
 			<button class="login-btn use" type="primary" size="small" open-type="getUserInfo" lang="zh_CN" @getuserinfo="getuserinfo">微信授权</button>
@@ -25,13 +25,12 @@
 				authorizeType:''
 			}
 		},
-		onLoad(option) {
-			this.authorizeType = option.type
+		onLoad(e) {
+			this.authorizeType = e.type
 		},
 		methods:{
 			//授权登录 
 			getuserinfo: function (e) {
-				console.log(e)
 			    if (e.detail.userInfo) {
 					this.wxGetUserInfo()
 			    }else{
@@ -43,7 +42,7 @@
 					case '0':
 						this.$api.switchTabTo('/pages/tabBar/home/home')
 						break;
-						default:
+					default :
 						uni.navigateBack({delta: 1});
 				}
 			},
@@ -93,9 +92,9 @@
 			}
 		}
 		.login-content{
-			width: 620rpx;
+			width: 580rpx;
 			margin: 95rpx auto;
-			line-height: 36rpx;
+			line-height: 40rpx;
 			font-size: $font-size-24;
 			color: #666666;
 			text-align: justify;
@@ -108,7 +107,7 @@
 			align-items: center;
 			margin: 0 auto;
 			.login-btn{
-				width: 654rpx;
+				width: 630rpx;
 				height: 80rpx;
 				border-radius: 14rpx;
 				font-size: $font-size-32;

pages/goods/goods.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script>
-	import commodityList from '@/components/module/listTemplate/commodityList'
+	import commodityList from '@/components/cm-module/listTemplate/commodityList'
 	
 	export default{
 		components:{
@@ -17,7 +17,6 @@
 				emptyText: '',
 				lastPageType: '',
 				lastPageVal: '',
-				userID:'',
 			}
 		},		
 		onLoad(option) {
@@ -35,11 +34,17 @@
 					key: 'commodity_id',
 					success: function (res) {
 					    const id = res.data;
-						if(type === '商品分类') {
-							self.serverUrl = `/product/listByTinyTypeID?tinyTypeID=${id}`;
-							self.emptyText = '该分类暂时还没有商品哟，去逛逛别的吧~';
-							self.$refs.childList.getListFromServer();
+						switch(type){
+							case '商品分类':
+								self.serverUrl = `/product/listByTinyTypeID?tinyTypeID=${id}`;
+								self.emptyText = '该分类暂时还没有商品哟，去逛逛别的吧~';
+								break;
+							case '导航分类':
+								self.serverUrl = `/home/classify?classifyId=${id}`;
+								self.emptyText = '该分类暂时还没有商品哟，去逛逛别的吧~';
+								break;
 						}
+						self.$refs.childList.getListFromServer();
 					}
 				})
 				if(type !== '商品分类') {
@@ -66,9 +71,6 @@
 			if(thisPage.refresh) {
 				this.setServerUrl(thisPage.listData);
 			}
-			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userID
-			})
 		}
 	}
 </script>

pages/goods/product.vue

@@ -211,14 +211,14 @@
 
 <script>
 	import { mapState,mapMutations } from 'vuex'
-	import headerPoduct from '@/components/module/headerNavbar/header-poduct' 		 //自定义导航
+	import headerPoduct from '@/components/cm-module/headerNavbar/header-poduct' 		 //自定义导航
 	import authorize from '@/common/config/authorize.js'
 	import uniStars from '@/components/uni-stars/uni-stars.vue'
 	import parser from "@/components/jyf-Parser/index" //富文本处理
 	import tuiSkeleton from "@/components/tui-skeleton/tui-skeleton"
-	import supplierDetails from "@/components/module/productDetails/supplierDetails" //供应商详情
-	import recommend from "@/components/module/productDetails/recommend" //供应商详情
-	import evaluate from "@/components/module/productDetails/evaluate" //供应商详情
+	import supplierDetails from "@/components/cm-module/productDetails/supplierDetails" //供应商详情
+	import recommend from "@/components/cm-module/productDetails/recommend" //供应商详情
+	import evaluate from "@/components/cm-module/productDetails/evaluate" //供应商详情
 	import wxLogin from "@/common/config/wxLogin.js"
 	import { queryProductDetils } from "@/api/product.js" 
 	import { shoppingAddCart } from "@/api/cart.js" 
@@ -653,7 +653,6 @@
 				-webkit-line-clamp: 2;
 				overflow: hidden;
 				margin-bottom: 16rpx;
-				
 			}
 			.wrap-main-pricenone{
 				line-height: 44rpx;

pages/login/bindOperator.vue

@@ -91,8 +91,17 @@
 			}
 		},
 		onLoad(option) {
+			console.log(option)
 			uni.setStorageSync('bind_id', option.userID);
 			this.getVerificationCode()
+			authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
+				if(wxResponse == 1){
+					this.getWxAuthorize()
+				}else{
+					this.$api.navigateTo('/pages/authorization/authorization')
+					this.isUserInfo = true
+				}
+			})	
 		},
 		computed: {
 			...mapState(['isWxAuthorize'])
@@ -145,7 +154,13 @@
 					this.$util.msg('验证码格式不正确',2000)
 					return
 				}
-				this.bindingWechatLogin()
+				authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
+					if(wxResponse == 1){
+						this.bindingWechatLogin()
+					}else{
+						this.$api.navigateTo('/pages/authorization/authorization')
+					}
+				})	
 			},
 			getVerificationCode(){//图形验证
 				getImageCode().then(res => {
@@ -165,7 +180,7 @@
 				if( this.imageCode == ''){
 					this.$util.msg('请输入图形验证码',2000);
 					return
-				}
+				}			
 				let params = {
 						userId:uni.getStorageSync('bind_id'),
 						mobile:this.bindMobile,
@@ -197,6 +212,7 @@
 					this.isMobileDisabled = false;
 				})
 			},
+			
 			bindingWechatLogin(){//获取用户基本信息登录
 				wx.getUserInfo({
 					success: res => {
@@ -214,20 +230,14 @@
 							this.$api.switchTabTo('/pages/tabBar/home/home')
 						}).catch(response =>{
 							this.$util.msg(response.msg,2000)
-							this.isUserInfo = false
+							this.isUserInfo = true
 						})			
 					}
 				})
 			}
 		},
 		onShow() {
-			authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
-				if(wxResponse == 1){
-					this.getWxAuthorize()
-				}else{
-					this.$api.navigateTo('/pages/authorization/authorization')
-				}
-			})	
+
 		}
 	}
 </script>

pages/search/search-order.vue

@@ -96,10 +96,10 @@
 	import orSearch from '@/components/uni-search/or-search.vue'
 	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
 	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	import orderButton from '@/components/module/orderDetails/orderListButton'	 //按钮
+	import orderButton from '@/components/cm-module/orderDetails/orderListButton'	 //按钮
 	import modalLayer from "@/components/modal-layer"
 	import empty from "@/components/empty";
-	import shareAlert from '@/components/module/modelAlert/shareAlert'			 //分享弹窗
+	import shareAlert from '@/components/cm-module/modelAlert/shareAlert'			 //分享弹窗
 	import authorize from '@/common/config/authorize.js'
 	import { 
 		searchOrderInfo, 

pages/service/aftersale.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script>
-	import richTextTemplate from '@/components/module/listTemplate/richTextTemplate'
+	import richTextTemplate from '@/components/cm-module/listTemplate/richTextTemplate'
 	import { queryAfterSale } from "@/api/other.js"
 	export default{
 		components: {

pages/service/member.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script>
-	import memberList from '@/components/module/listTemplate/memberList'
+	import memberList from '@/components/cm-module/listTemplate/memberList'
 	
 	export default {
 		components:{

pages/service/organagree.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script>
-	import richTextTemplate from '@/components/module/listTemplate/richTextTemplate'
+	import richTextTemplate from '@/components/cm-module/listTemplate/richTextTemplate'
 	import { protocolAgree } from "@/api/other.js"
 	
 	export default{

pages/service/privacyagree.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script>
-	import richTextTemplate from '@/components/module/listTemplate/richTextTemplate'
+	import richTextTemplate from '@/components/cm-module/listTemplate/richTextTemplate'
 	import { protocolAgree } from "@/api/other.js"
 	
 	export default{

pages/service/shoppingnotice.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script>
-	import richTextTemplate from '@/components/module/listTemplate/richTextTemplate'
+	import richTextTemplate from '@/components/cm-module/listTemplate/richTextTemplate'
 	import { queryAfterSale } from "@/api/other.js"
 	export default{
 		components: {

pages/service/useragree.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script>
-	import richTextTemplate from '@/components/module/listTemplate/richTextTemplate'
+	import richTextTemplate from '@/components/cm-module/listTemplate/richTextTemplate'
 	import { protocolAgree } from "@/api/other.js"
 	
 	export default{

pages/tabBar/category/category.vue

@@ -58,12 +58,6 @@
 			this.initData();
 		},
 		methods: {
-			// 跳转至商品列表
-			navToList(id){
-				uni.navigateTo({
-					url: `/pages/product/list?cate_id=${id}`
-				})
-			},
 			// 数据初始化
 			initData() {
 				this.getProductCate();

pages/tabBar/home/home.vue

@@ -7,8 +7,7 @@
 				<bt-search :clickPath="clickPath" :toestText='hotSearchText'></bt-search>
 			</view>
 			<view class="banner-section">
-				<!-- <uni-swiper-dot :info="bannerList" :current="current" field="content" :mode="mode" > -->
-				<swiper class="banner tui-banner tui-skeleton-rect" circular @change="swiperChange" :autoplay="true" :interval="5000" :duration="500" :circular="false">
+				<swiper class="banner tui-banner tui-skeleton-rect" circular @change="swiperChange" :autoplay="true" :interval="5000" :duration="500" :circular="true">
 					<swiper-item v-for="(item, index) in bannerImageList" :key="index" class="banner-item"> 
 						<image :src="item" />
 					</swiper-item>
@@ -19,27 +18,33 @@
 						  :class="[idx===current?'swiper__dots-long':'none']" 
 						  :data-index="current" class="swiper__dots-item" />
 				</view>
-				<!-- </uni-swiper-dot> -->
 			</view>
 			<view class="cate-section clearfix">
+				<!-- 自定义分类导航栏 -->
+				<view class="tabbar clearfix">
+					<view class="cate-item" v-for="(nav,idx) in productsClassifyList" :key="idx" @click.stop="navToListPage(nav)">
+						<image class="tui-skeleton-circular" :src="nav.classifyImage"></image>
+						<text class="tui-skeleton-rect">{{nav.classifyName}}</text>
+					</view>
+				</view>
 				<!-- 优选分类 -->
 				<view class="tabbar clearfix">
 					<view class="cate-item-info" @click.stop="this.$api.navToListPage({type:'1',value:firstModulesName})">
-						<image class="tui-skeleton-fillet" :src="firstModulesImage"></image>
+						<image class="tui-skeleton-circular" :src="firstModulesImage"></image>
 						<text class="tui-skeleton-fillet">{{firstModulesName}}</text>
 					</view>
 					<view class="cate-item-info" @click.stop="this.$api.navToListPage({type:'2',value:secondModulesName})">
-						<image class="tui-skeleton-fillet" :src="secondModulesImage"></image>
+						<image class="tui-skeleton-circular" :src="secondModulesImage"></image>
 						<text class="tui-skeleton-fillet">{{secondModulesName}}</text>
 					</view>
 					<view class="cate-item-info" @click="showTost">
-						<image class="tui-skeleton-fillet" :src="navInforList[0].icon"></image>
+						<image class="tui-skeleton-circular" :src="navInforList[0].icon"></image>
 						<text class="tui-skeleton-fillet">{{navInforList[0].text}}</text>
 					</view>
 					<view class="cate-item-info">
 						<!-- #ifdef MP-WEIXIN -->
 						<button class="contact-btn" open-type="contact" @bindcontact="handleContact">
-							<image class="tui-skeleton-fillet" :src="navInforList[1].icon"></image>
+							<image class="tui-skeleton-circular" :src="navInforList[1].icon"></image>
 						</button>	
 						<!-- #endif -->
 						<text class="tui-skeleton-fillet">{{navInforList[1].text}}</text>
@@ -48,9 +53,9 @@
 			</view>
 			<!-- 热销商品 -->
 			<view class="hotgoods-section">
-				<view class="s-header tui-skeleton-fillet" @click="this.$api.navToListPage({type:'3',value:thirdModulesName})">
-					<text class="tip">{{thirdModulesName}}</text>
-					<text class="tit">更多</text>
+				<view class="s-header" @click="this.$api.navToListPage({type:'3',value:thirdModulesName})">
+					<text class="tip tui-skeleton-fillet">{{thirdModulesName}}</text>
+					<text class="tit tui-skeleton-fillet">更多</text>
 					<text class="iconfont icon-xiayibu"></text>
 				</view>
 				<view class="hotgoods-swiper">
@@ -129,6 +134,7 @@
 
 <script>
 	import tuiSkeleton from "@/components/tui-skeleton/tui-skeleton"
+	import navigationTab from "@/components/cm-module/home/navigationTab.vue"
 	import authorize from '@/common/config/authorize.js'
 	import modalLayer from "@/components/modal-layer"
 	import btSearch from '@/components/uni-search/bt-search.vue'
@@ -139,6 +145,7 @@
 	export default {
 		components:{
 			tuiSkeleton,
+			navigationTab,
 			modalLayer,
 			btSearch,
 			uniStars,
@@ -159,17 +166,23 @@
 				modallayer:false,
 				isLogin:false,
 				bannerImageList:[],
-				hotGoodsList:[],
 				skeletonShow: true,
 				organizeProducts:[],//常用商品
+				productsClassifyList:[
+					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/icon-vip%403x.png',classifyName:'采美采购'},
+					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/icon-vip%403x.png',classifyName:'采美采购'},
+					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/icon-vip%403x.png',classifyName:'采美采购'},
+					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/icon-vip%403x.png',classifyName:'采美采购'},
+					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/icon-vip%403x.png',classifyName:'采美采购'}
+				],//分类导航
 				firstModulesName:'https://img.caimei365.com/group1/M00/03/8C/Cmis215XHXSAAZU0AACaPrfbB8I435.png', //优惠模块1
 				secondModulesName:'', //优惠模块2
 				firstModulesImage:'https://img.caimei365.com/group1/M00/03/8C/Cmis215XHXSAAZU0AACaPrfbB8I435.png',//优惠模块icon1
 				secondModulesImage:'',//优惠模块icon2
 				thirdModulesName:'', //优惠模块3
 				navInforList:[
-					{text:'会员中心',icon:'https://img.caimei365.com/group1/M00/03/8C/Cmis215XHXSAAZU0AACaPrfbB8I435.png'},
-					{text:'在线客服',icon:'https://img.caimei365.com/group1/M00/03/8D/Cmis215XHXWABv0rAACt9b8scec656.png'}
+					{text:'会员中心',icon:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/icon-vip%403x.png'},
+					{text:'在线客服',icon:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/icon-kefu%403x.png'}
 				],
 				navServerList:[
 					{text:'会员优惠',icon:'../../../static/temp/server1@2x.png',path:'/pages/service/member'},
@@ -222,6 +235,7 @@
 					this.firstModulesImage= data.firstModulesImage
 					this.secondModulesImage= data.secondModulesImage
 					this.thirdModulesName= data.thirdModulesName
+					this.productsClassifyList = data.productsClassifyList
 					this.skeletonShow = false;
 					if(this.isWxAuthorize){
 						this.$store.commit('updateAllNum',data.shoppingCartCount)
@@ -254,7 +268,7 @@
 					key: 'commodity_id',
 					data: nav.id,
 					success: function () {
-						self.$api.navToListPage({type:'商品分类',value:nav.classifyName,id:nav.id});
+						self.$api.navToListPage({type:'导航分类',value:nav.classifyName,id:nav.id});
 					}
 				})
 			},
@@ -406,7 +420,6 @@
 		.cate-item {
 			width: 118rpx;
 			margin-right:28rpx;
-			margin-bottom:28rpx;
 			display: flex;
 			float: left;
 			flex-direction: column;
@@ -424,11 +437,12 @@
 				width: 90rpx;
 				height: 90rpx;
 				margin-bottom: 8rpx;
+				border-radius: 50%;
 			}	
 		}
 		.cate-item-info {
-			width: 160rpx;
-			margin-right:20.666rpx;
+			width: 118rpx;
+			margin-right:76.5rpx;
 			display: flex;
 			float: left;
 			flex-direction: column;
@@ -440,12 +454,13 @@
 				margin-right: 0;
 			}
 			image {
-				width: 160rpx;
+				width: 90rpx;
 				height: 90rpx;
 				margin-bottom: 16rpx;
+				border-radius: 50%;
 			}	
 			button.contact-btn{
-				width: 160rpx;
+				width: 118rpx;
 				height: 90rpx;
 				margin: 0;
 				padding: 0;
@@ -461,46 +476,22 @@
 				background-color:#FFFFFF;
 				margin-bottom: 16rpx;
 				image{
-					width: 160rpx;
+					width: 90rpx;
 					height: 90rpx;
 					margin-bottom: 0;
+					border-radius: 50%;
 				}
 			}
 		}
 	}
-	/* 活动 */
-	.hot-section{
-		padding:0 24rpx 48rpx 24rpx; 
-		background: #FFFFFF;
-		.ht-l{
-			width: 339rpx;
-			height: 188rpx;
-			float: left;
-			image{
-				width: 339rpx;
-				height: 188rpx;
-				border-radius:10rpx;
-			}
-		}
-		.ht-r{
-			width: 339rpx;
-			height: 188rpx;
-			float: right;
-			image{
-				width: 339rpx;
-				height: 188rpx;
-				border-radius:10rpx;
-			}
-		}
-	}
 	.hotgoods-section{
 		padding: 4rpx 0 24rpx 24rpx;
 		background: #fff;
 		.s-header{
 			display:flex;
 			align-items:center;
-			height: 40rpx;
-			line-height: 40rpx;
+			height: 50rpx;
+			line-height: 50rpx;
 			.tip{
 				flex: 4;
 				font-size: 30rpx;

pages/user/about/about.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script>
-	import richTextTemplate from '@/components/module/listTemplate/richTextTemplate'
+	import richTextTemplate from '@/components/cm-module/listTemplate/richTextTemplate'
 	import { queryAfterSale } from "@/api/other.js"
 	
 	var self;

pages/user/address/address.vue

@@ -49,7 +49,7 @@
 
 <script>
 	import authorize from '@/common/config/authorize.js'	
-	import modelAlert from '@/components/module/modelAlert/modelAlert.vue'
+	import modelAlert from '@/components/cm-module/modelAlert/modelAlert.vue'
 	import { queryAddressList , deleteNewAddress } from '@/api/cart.js'
 	export default {
 		components:{

pages/user/operator/list.vue

@@ -27,7 +27,7 @@
 				<scroll-view scroll-y="true" >
 					<view class="list" v-for="(item, index) in operatorList" :key="index" @click.stop="showOperatorModel(item)">
 						<view class="list-left">
-							<view class="list-head"><image :src="item.headimgurl ? item.headimgurl : 'https://img.caimei365.com/group1/M00/03/94/Cmis216Sk_OAfH-2AAA3tX5g6uo305.png'" mode=""></image></view>
+							<view class="list-head"><image :src="item.headimgurl ? item.headimgurl : '../../../static/temp/icon-seller@3x.png'" mode=""></image></view>
 							<view class="list-tel">
 								<text class="txt">{{item.linkName}}</text>
 								<text class="txt">{{item.mobile}}</text>
@@ -337,13 +337,13 @@
 			.head{
 				width: 92rpx;
 				height: 92rpx;
-				border-radius: 50%;
-				border: 1px solid $color-system;
+				border-radius: 14rpx;
+				border: 1px solid #ebebeb;
 				float: left;
 				image{
 					width: 92rpx;
 					height: 92rpx;
-					border-radius: 50%;
+					border-radius: 14rpx;
 				}
 			}
 		}

pages/user/order/create-order.vue

@@ -61,11 +61,11 @@
 </template>
 
 <script>
-	import choiceAddress from '@/components/module/creatOrder/choiceAddress'  
-	import goodsList from '@/components/module/creatOrder/goodsList'
-	import invoiceTent from '@/components/module/creatOrder/invoiceTent'
-	import freight from '@/components/module/creatOrder/freight'
-	import freightAlert from '@/components/module/modelAlert/freightAlert'
+	import choiceAddress from '@/components/cm-module/creatOrder/choiceAddress'  
+	import goodsList from '@/components/cm-module/creatOrder/goodsList'
+	import invoiceTent from '@/components/cm-module/creatOrder/invoiceTent'
+	import freight from '@/components/cm-module/creatOrder/freight'
+	import freightAlert from '@/components/cm-module/modelAlert/freightAlert'
 	import modalLayer from "@/components/modal-layer"
 	import { queryAddressList } from "@/api/cart.js" 
 	import { createOrderInfo,createOrderSubmit,getOrderPostage } from "@/api/order.js" 

pages/user/order/myOrder.vue

@@ -98,17 +98,17 @@
 </template>
 
 <script>
-	import headerBack from '@/components/module/headerNavbar/header-back' 		 	 //自定义导航
+	import headerBack from '@/components/cm-module/headerNavbar/header-back' 		 	 //自定义导航
 	import tuiTabs from "@/components/tui-components/tui-tabs/tui-tabs"
 	import tuiListCell from "@/components/tui-components/list-cell/list-cell"
 	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
 	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	import orderButton from '@/components/module/orderDetails/orderListButton'		 //按钮
+	import orderButton from '@/components/cm-module/orderDetails/orderListButton'		 //按钮
 	import modalLayer from "@/components/modal-layer"
 	import empty from "@/components/empty";
-	import shareAlert from '@/components/module/modelAlert/shareAlert'			 //分享弹窗
-	import modelAlert from '@/components/module/modelAlert/modelAlert'			 //删除弹窗
-	import cancelAlert from '@/components/module/modelAlert/cancelAlert'		 //取消弹窗
+	import shareAlert from '@/components/cm-module/modelAlert/shareAlert'			 //分享弹窗
+	import modelAlert from '@/components/cm-module/modelAlert/modelAlert'			 //删除弹窗
+	import cancelAlert from '@/components/cm-module/modelAlert/cancelAlert'		 //取消弹窗
 	export default {
 		components: {
 			empty,

pages/user/order/order-cashier.vue

@@ -41,8 +41,8 @@
 </template>
 
 <script>
-	import headerNavbar from "@/components/module/headerNavbar/headerNavbar.vue" //顶部自定义胶囊'
-	import shareAlert from "@/components/module/modelAlert/shareAlert.vue" //分享弹窗'
+	import headerNavbar from "@/components/cm-module/headerNavbar/headerNavbar.vue" //顶部自定义胶囊'
+	import shareAlert from "@/components/cm-module/modelAlert/shareAlert.vue" //分享弹窗'
 	const  thorui = require("@/components/clipboard/clipboard.thorui.js")
 	export default{
 		components:{

pages/user/order/order-details.vue

@@ -33,16 +33,16 @@
 </template>
 
 <script>
-	import headerBack from '@/components/module/headerNavbar/header-back' 		 	 //自定义导航
-	import orderAddress from '@/components/module/orderDetails/orderAddress' 		 //地址信息
-	import goodsList from '@/components/module/orderDetails/goodsList'		 		 //商品列表
-	import invoiceTent from '@/components/module/orderDetails/invoiceTent'	 		 //发票信息
-	import orderInformation from '@/components/module/orderDetails/orderInformation' //订单信息
-	import transfeRecord from '@/components/module/orderDetails/transfeRecord'		 //转账信息
-	import paymentRecord from '@/components/module/orderDetails/paymentRecord'		 //支付记录
-	import refundRecord from '@/components/module/orderDetails/refundRecord'		 //退款记录
-	import orderButton from '@/components/module/orderDetails/orderButton'			 //底部按钮
-	import shareAlert from '@/components/module/modelAlert/shareAlert.vue'			 //分享弹窗
+	import headerBack from '@/components/cm-module/headerNavbar/header-back' 		 	 //自定义导航
+	import orderAddress from '@/components/cm-module/orderDetails/orderAddress' 		 //地址信息
+	import goodsList from '@/components/cm-module/orderDetails/goodsList'		 		 //商品列表
+	import invoiceTent from '@/components/cm-module/orderDetails/invoiceTent'	 		 //发票信息
+	import orderInformation from '@/components/cm-module/orderDetails/orderInformation' //订单信息
+	import transfeRecord from '@/components/cm-module/orderDetails/transfeRecord'		 //转账信息
+	import paymentRecord from '@/components/cm-module/orderDetails/paymentRecord'		 //支付记录
+	import refundRecord from '@/components/cm-module/orderDetails/refundRecord'		 //退款记录
+	import orderButton from '@/components/cm-module/orderDetails/orderButton'			 //底部按钮
+	import shareAlert from '@/components/cm-module/modelAlert/shareAlert.vue'			 //分享弹窗
 	import { queryOrderDetails,cancelOrder,deleteOrder,confirmReceipt,affirmOrder } from "@/api/order.js" 
 	export default {
 		components:{

pages/user/order/order-list.vue

@@ -84,16 +84,16 @@
 </template>
 
 <script>
-	import headerBack from '@/components/module/headerNavbar/header-back' 		 	 //自定义导航
+	import headerBack from '@/components/cm-module/headerNavbar/header-back' 		 	 //自定义导航
 	import btSearch from '@/components/uni-search/bt-search.vue'						//搜索
 	import tuiSkeleton from "@/components/tui-skeleton/tui-skeleton"
 	import tuiListCell from "@/components/tui-components/list-cell/list-cell"
 	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
 	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	import orderButton from '@/components/module/orderDetails/orderListButton'		 //按钮
+	import orderButton from '@/components/cm-module/orderDetails/orderListButton'		 //按钮
 	import modalLayer from "@/components/modal-layer"
 	import empty from "@/components/empty";
-	import shareAlert from '@/components/module/modelAlert/shareAlert'			 //分享弹窗
+	import shareAlert from '@/components/cm-module/modelAlert/shareAlert'			 //分享弹窗
 	import { queryOrderList,cancelOrder,deleteOrder,confirmReceipt, affirmOrder } from "@/api/order.js" 
 	
 	export default {

pages/user/order/order-sharedetails.vue

@@ -22,13 +22,13 @@
 </template>
 
 <script>
-	import orderAddress from '@/components/module/orderDetails/orderAddress' 		 //地址信息
-	import goodsList from '@/components/module/orderDetails/goodsList'		 		 //商品列表
-	import invoiceTent from '@/components/module/orderDetails/invoiceTent'	 		 //发票信息
-	import orderInformation from '@/components/module/orderDetails/orderInformation' //订单信息
-	import transfeRecord from '@/components/module/orderDetails/transfeRecord'		 //转账信息
-	import paymentRecord from '@/components/module/orderDetails/paymentRecord'		 //支付记录
-	import refundRecord from '@/components/module/orderDetails/refundRecord'		 //退款记录
+	import orderAddress from '@/components/cm-module/orderDetails/orderAddress' 		 //地址信息
+	import goodsList from '@/components/cm-module/orderDetails/goodsList'		 		 //商品列表
+	import invoiceTent from '@/components/cm-module/orderDetails/invoiceTent'	 		 //发票信息
+	import orderInformation from '@/components/cm-module/orderDetails/orderInformation' //订单信息
+	import transfeRecord from '@/components/cm-module/orderDetails/transfeRecord'		 //转账信息
+	import paymentRecord from '@/components/cm-module/orderDetails/paymentRecord'		 //支付记录
+	import refundRecord from '@/components/cm-module/orderDetails/refundRecord'		 //退款记录
 	import { queryOrderDetails } from "@/api/order.js"
 	
 	export default {

pages/user/regularPurchase/regularPurchase.vue

@@ -37,7 +37,7 @@
 </template>
 
 <script>
-	import productList from '@/components/module/listTemplate/productList'
+	import productList from '@/components/cm-module/listTemplate/productList'
 	import { shoppingAddCart } from "@/api/cart.js" 
 	export default{
 		components:{

pages/user/setting/password.vue

@@ -49,7 +49,7 @@
 
 <script>
 	import authorize from '@/common/config/authorize.js'	
-	import modelAlert from '@/components/module/modelAlert/modelAlert.vue'
+	import modelAlert from '@/components/cm-module/modelAlert/modelAlert.vue'
 	export default {
 		components:{
 			modelAlert

pages/user/setting/phone.vue

@@ -49,7 +49,7 @@
 
 <script>
 	import authorize from '@/common/config/authorize.js'	
-	import modelAlert from '@/components/module/modelAlert/modelAlert.vue'
+	import modelAlert from '@/components/cm-module/modelAlert/modelAlert.vue'
 	export default {
 		components:{
 			modelAlert