整理优化项目结构

components/cm-module/cart-components/index.vue

@@ -482,7 +482,6 @@
 
 <script>
 import authorize from '@/common/config/authorize.js'
-import tuiSkeleton from '@/components/tui-skeleton/tui-skeleton'
 import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
 import tuiNomore from '@/components/tui-components/nomore/nomore'
 import activiPopup from '@/components/cm-module/productDetails/cm-activipopu'
@@ -499,7 +498,6 @@ export default {
 		}
 	},
 	components: {
-		tuiSkeleton,
 		tuiLoadmore,
 		tuiNomore,
 		activiPopup,

components/tui-skeleton/tui-skeleton.vue

@@ -1,246 +0,0 @@
-<template>
-	<view class="tui-skeleton-cmomon tui-skeleton-box" :style="{width: winWidth+'px', height:winHeight+'px', backgroundColor:backgroundColor}">
-		<view class="tui-skeleton-cmomon" v-for="(item,index) in skeletonElements" :key="index" :style="{width: item.width+'px', height:item.height+'px', left: item.left+'px', top: item.top+'px',backgroundColor: skeletonBgColor,borderRadius:getRadius(item.skeletonType,borderRadius)}"></view>
-		<view class="tui-loading" :class="[getLoadingType(loadingType)]" v-if="isLoading"></view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: "tuiSkeleton",
-		props: {
-			//选择器(外层容器)
-			selector: {
-				type: String,
-				default: "tui-skeleton"
-			},
-			//外层容器背景颜色
-			backgroundColor: {
-				type: String,
-				default: "#fff"
-			},
-			//骨架元素背景颜色
-			skeletonBgColor: {
-				type: String,
-				default: "#e9e9e9"
-			},
-			//骨架元素类型：矩形，圆形，带圆角矩形["rect","circular","fillet"]
-			//默认所有，根据页面情况进行传值
-			//页面对应元素class为：tui-skeleton-rect，tui-skeleton-circular，tui-skeleton-fillet
-			//如果传入的值不在下列数组中，则为自定义class值，默认按矩形渲染
-			skeletonType: {
-				type: Array,
-				default () {
-					return ["rect", "circular", "fillet"]
-				}
-			},
-			//圆角值，skeletonType=fillet时生效
-			borderRadius: {
-				type: String,
-				default: "16rpx"
-			},
-			//骨架屏预生成数据：提前生成好的数据，当传入该属性值时，则不会再次查找子节点信息
-			preloadData: {
-				type: Array,
-				default () {
-					return []
-				}
-			},
-			//是否需要loading
-			isLoading: {
-				type: Boolean,
-				default: true
-			},
-			//loading类型[1-10]
-			loadingType: {
-				type: Number,
-				default: 1
-			}
-		},
-		created() {
-			const res = uni.getSystemInfoSync();
-			this.winWidth = res.windowWidth;
-			this.winHeight = res.windowHeight;
-			//如果有预生成数据，则直接使用
-			this.isPreload(true)
-		},
-		// #ifdef H5
-		mounted() {
-			this.$nextTick(() => {
-				this.nodesRef(`.${this.selector}`).then((res) => {
-					this.winHeight = res[0].height + Math.abs(res[0].top)
-				});
-				!this.isPreload() && this.selectorQuery()
-			})
-
-		},
-		// #endif
-		onReady() {
-			this.nodesRef(`.${this.selector}`).then((res) => {
-				if(res[0]){
-					this.winHeight = res[0].height + Math.abs(res[0].top)
-				}
-			});
-			!this.isPreload() && this.selectorQuery()
-		},
-		data() {
-			return {
-				winWidth: 375,
-				winHeight: 800,
-				skeletonElements: []
-			};
-		},
-		methods: {
-			getLoadingType: function(type) {
-				let value = 1
-				if (type && type > 0 && type < 11) {
-					value = type
-				}
-				return 'tui-loading-' + value
-			},
-			getRadius: function(type, val) {
-				let radius = "0"
-				if (type == "circular") {
-					radius = "50%"
-				} else if (type == "fillet") {
-					radius = val
-				}
-				return radius;
-			},
-			isPreload(init) {
-				let preloadData = this.preloadData || []
-				if (preloadData.length) {
-					init && (this.skeletonElements = preloadData)
-					return true
-				}
-				return false
-			},
-			async selectorQuery() {
-				let skeletonType = this.skeletonType || []
-				let nodes = []
-				for (let item of skeletonType) {
-					let className = `.${this.selector} >>> .${item}`
-					// #ifdef H5
-					className = `.${item}`
-					// #endif
-					if (~"rect_circular_fillet".indexOf(item)) {
-						// #ifndef H5
-						className = `.${this.selector} >>> .${this.selector}-${item}`
-						// #endif
-						// #ifdef H5
-						className = `.${this.selector}-${item}`
-						// #endif
-					}
-					await this.nodesRef(className).then((res) => {
-						res.map(d => {
-							d.skeletonType = item
-						})
-						nodes = nodes.concat(res)
-					})
-				}
-				this.skeletonElements = nodes
-			},
-			async nodesRef(className) {
-				return await new Promise((resolve, reject) => {
-					uni.createSelectorQuery().selectAll(className).boundingClientRect((res) => {
-						if (res) {
-							resolve(res);
-						} else {
-							reject(res)
-						}
-					}).exec();
-				})
-			}
-		}
-	}
-</script>
-
-<style>
-	.tui-skeleton-cmomon {
-		position: absolute;
-		z-index: 99999;
-		overflow: hidden;
-	}
-
-	.tui-skeleton-box {
-		left: 0;
-		top: 0;
-	}
-
-	.tui-loading {
-		display: inline-block;
-		vertical-align: middle;
-		width: 40rpx;
-		height: 40rpx;
-		background: 0 0;
-		border-radius: 50%;
-		border: 2px solid;
-		animation: tui-rotate 0.7s linear infinite;
-		position: fixed;
-		z-index: 999999;
-		left: 50%;
-		top: 50%;
-		margin-left: -20rpx;
-		margin-top: -20rpx;
-	}
-
-	.tui-loading-1 {
-		border-color: #e5e5e5 #e5e5e5 #e5e5e5 #5677fc;
-	}
-
-	.tui-loading-2 {
-		border-color: #e5e5e5 #e5e5e5 #e5e5e5 #8f8d8e;
-	}
-
-	.tui-loading-3 {
-		border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) #fff;
-	}
-
-	.tui-loading-4 {
-		border-color: #e5e5e5 #e5e5e5 #e5e5e5 #35b06a;
-	}
-
-	.tui-loading-5 {
-		border-color: #e5e5e5 #e5e5e5 #e5e5e5 #fc872d;
-	}
-
-	.tui-loading-6 {
-		border-color: #e5e5e5 #e5e5e5 #e5e5e5 #eb0909;
-	}
-
-	.tui-loading-7 {
-		border-color: #5677fc transparent #5677fc transparent;
-	}
-
-	.tui-loading-8 {
-		border-color: #35b06a transparent #35b06a transparent;
-	}
-
-	.tui-loading-9 {
-		border-color: #fc872d transparent #fc872d transparent;
-	}
-
-	.tui-loading-10 {
-		border-color: #eb0909 transparent #eb0909 transparent;
-	}
-
-	@-webkit-keyframes tui-rotate {
-		0% {
-			transform: rotate(0);
-		}
-
-		100% {
-			transform: rotate(360deg);
-		}
-	}
-
-	@keyframes tui-rotate {
-		0% {
-			transform: rotate(0);
-		}
-
-		100% {
-			transform: rotate(360deg);
-		}
-	}
-</style>

components/uni-badge/uni-badge.vue

@@ -1,99 +0,0 @@
-<template>
-	<text v-if="text" :class="inverted ? 'uni-badge-' + type + ' uni-badge--' + size + ' uni-badge-inverted' : 'uni-badge-' + type + ' uni-badge--' + size" class="uni-badge" @click="onClick()">{{ text }}</text>
-</template>
-
-<script>
-	export default {
-		name: 'UniBadge',
-		props: {
-			type: {
-				type: String,
-				default: 'default'
-			},
-			inverted: {
-				type: Boolean,
-				default: false
-			},
-			text: {
-				type: String,
-				default: ''
-			},
-			size: { // small.normal
-				type: String,
-				default: 'normal'
-			}
-		},
-		methods: {
-			onClick() {
-				this.$emit('click')
-			}
-		}
-	}
-</script>
-
-<style>
-	@charset "UTF-8";
-
-	.uni-badge {
-		font-family: 'Helvetica Neue', Helvetica, sans-serif;
-		box-sizing: border-box;
-		font-size: 12px;
-		line-height: 1;
-		display: inline-block;
-		padding: 3px 6px;
-		color: #333;
-		border-radius: 100px;
-		background-color: #f1f1f1
-	}
-
-	.uni-badge.uni-badge-inverted {
-		padding: 0 5px 0 0;
-		color: #999;
-		background-color: transparent
-	}
-
-	.uni-badge-primary {
-		color: #fff;
-		background-color: #007aff
-	}
-
-	.uni-badge-primary.uni-badge-inverted {
-		color: #007aff;
-		background-color: transparent
-	}
-
-	.uni-badge-success {
-		color: #fff;
-		background-color: #4cd964
-	}
-
-	.uni-badge-success.uni-badge-inverted {
-		color: #4cd964;
-		background-color: transparent
-	}
-
-	.uni-badge-warning {
-		color: #fff;
-		background-color: #f0ad4e
-	}
-
-	.uni-badge-warning.uni-badge-inverted {
-		color: #f0ad4e;
-		background-color: transparent
-	}
-
-	.uni-badge-error {
-		color: #fff;
-		background-color: #dd524d
-	}
-
-	.uni-badge-error.uni-badge-inverted {
-		color: #dd524d;
-		background-color: transparent
-	}
-
-	.uni-badge--small {
-		transform: scale(.8);
-		transform-origin: center center
-	}
-</style>

manifest.json

@@ -85,5 +85,8 @@
     },
     "mp-toutiao" : {
         "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "version" : "1"
     }
 }

mixins/cmsMixins.js

@@ -21,7 +21,7 @@ const cmsMixins = {
                     console.log(`<-------${sYsText}统计数据成功------>`)
                 })
                 .catch(error => {
-                    console.log('<-------统计数据异常------>')
+                    console.log(`<-------统计${sYsText}数据异常------>`)
                 })
         },
     }

pages/goods/product.vue

@@ -675,7 +675,6 @@
 import { mapState, mapMutations } from 'vuex'
 import customP from '@/components/cm-module/headerNavbar/header-poduct' //自定义导航
 import parser from '@/components/jyf-Parser/index' //富文本处理
-import tuiSkeleton from '@/components/tui-skeleton/tui-skeleton'
 import cmPrice from './components/cm-price.vue' //价格显示
 import cmAttributes from './components/cm-attributes.vue' //规格信息
 import cmRecommend from './components/recommend' //相关推荐
@@ -694,7 +693,6 @@ export default {
 	components: {
 		customP,
 		parser,
-		tuiSkeleton,
 		cmRecommend,
 		cmPrice,
 		cmAttributes,

pages/login/register-supplier.vue

@@ -292,7 +292,7 @@
 	import authorize from '@/common/config/authorize.js'
 	import wxLogin from "@/common/config/wxLogin.js"
 	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
-	import supplierAlert from '@/components/cm-module/modelAlert/supplierRegisreAlert.vue'
+	import supplierAlert from './components/supplierRegisreAlert.vue'
 	import { supplierList,supplierMedicaCampNullList } from '@/common/json/data.json.js' //本地数据
 	import { uploadFileImage } from "@/services/public.js"
 	export default{

pages/second/product/product-details.vue

@@ -146,7 +146,6 @@
 	import secondPrice from './components/secondPrice.vue' //价格显示
 	import authorize from '@/common/config/authorize.js'
 	import uniStars from '@/components/uni-stars/uni-stars.vue'
-	import tuiSkeleton from '@/components/tui-skeleton/tui-skeleton'
 	import recommend from './components/secondRecommend' //相关推荐
 	import cmParameter from './components/secondParameters.vue' //相关参数
 	import wxLogin from '@/common/config/wxLogin.js'
@@ -156,7 +155,6 @@
 		components:{
 			uniStars,
 			customP,
-			tuiSkeleton,
 			recommend,
 			secondPrice,
 			cmParameter,

pages/seller/cart/cart.vue

@@ -259,7 +259,6 @@
 	</view>
 </template>
 <script>
-import tuiSkeleton from '@/components/tui-skeleton/tui-skeleton'
 import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
 import tuiNomore from '@/components/tui-components/nomore/nomore'
 import activiPopup from '@/components/cm-module/productDetails/cm-activipopu'
@@ -274,7 +273,6 @@ const defaultListQuery = {
 }
 export default {
 	components: {
-		tuiSkeleton,
 		tuiLoadmore,
 		tuiNomore,
 		activiPopup,

pages/seller/components/home.vue

@@ -30,7 +30,6 @@
 </template>
 
 <script>
-	import tuiSkeleton from '@/components/tui-skeleton/tui-skeleton'
 	import authorize from '@/common/config/authorize.js'
 	import customer from '@/components/cm-module/homeIndex/customer.vue'
 	import banner from '@/components/cm-module/homeIndex/banner.vue'
@@ -44,7 +43,6 @@
 	import { mapState,mapMutations} from 'vuex'
 	export default {
 		components:{
-			tuiSkeleton,
 			customer,
 			banner,
 			navbars,

pages/seller/components/user.vue

@@ -174,13 +174,9 @@
 </template>
 <script>
 import authorize from '@/common/config/authorize.js'
-import uniBadge from '@/components/uni-badge/uni-badge.vue'
 import { mapState, mapMutations } from 'vuex'
 
 export default {
-	components: {
-		uniBadge
-	},
 	data() {
 		return {
 			nvabarData: {

pages/seller/order/order-club-details.vue

@@ -127,7 +127,7 @@ import orderInformation from '@/components/cm-module/orderDetails/orderInformati
 import paymentRecord from '@/components/cm-module/orderDetails/paymentRecord' //支付记录
 import refundRecord from '@/components/cm-module/orderDetails/refundRecord' //退款记录
 import orderButton from './components/sellerDetaileButton' //底部按钮
-import shareAlert from '@/components/cm-module/modelAlert/sellerShareAlert.vue' //分享弹窗
+import shareAlert from './components/sellerShareAlert.vue' //分享弹窗
 import orderModel from '@/components/cm-module/modelAlert/order-alert' //付款弹窗
 import activiPopup from '@/components/cm-module/orderDetails/activipopu' //促销活动弹窗
 

pages/seller/order/order-details.vue

@@ -124,7 +124,7 @@ import orderInformation from '@/components/cm-module/orderDetails/orderInformati
 import paymentRecord from '@/components/cm-module/orderDetails/paymentRecord' //支付记录
 import refundRecord from '@/components/cm-module/orderDetails/refundRecord' //退款记录
 import orderButton from './components/sellerDetaileButton' //底部按钮
-import shareAlert from '@/components/cm-module/modelAlert/sellerShareAlert.vue' //分享弹窗
+import shareAlert from './components/sellerShareAlert.vue' //分享弹窗
 import orderModel from '@/components/cm-module/modelAlert/order-alert' //付款弹窗
 import activiPopup from '@/components/cm-module/orderDetails/activipopu' //促销活动弹窗
 

pages/seller/order/order-historylist.vue

@@ -261,13 +261,12 @@
 import { mapState, mapMutations } from 'vuex'		
 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 tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
 import tuiNomore from '@/components/tui-components/nomore/nomore'
 import orderButton from './components/sellerOrderButton' // 操作按钮
 import modalLayer from '@/components/modal-layer'
 import empty from '@/components/empty'
-import shareAlert from '@/components/cm-module/modelAlert/sellerShareAlert' // 分享弹窗
+import shareAlert from './components/sellerShareAlert.vue' // 分享弹窗
 
 export default {
 	components: {
@@ -277,7 +276,6 @@ export default {
 		tuiLoadmore,
 		tuiNomore,
 		orderButton,
-		tuiSkeleton,
 		modalLayer,
 		shareAlert
 	},

pages/seller/order/order-list.vue

@@ -297,13 +297,12 @@
 import { mapState, mapMutations } from 'vuex'
 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 tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
 import tuiNomore from '@/components/tui-components/nomore/nomore'
 import orderButton from './components/sellerOrderButton' //操作按钮
 import modalLayer from '@/components/modal-layer'
 import empty from '@/components/empty'
-import shareAlert from '@/components/cm-module/modelAlert/sellerShareAlert' //分享弹窗
+import shareAlert from './components/sellerShareAlert.vue' //分享弹窗
 import cmOrderDrawer from '../components/cm-order-drawer' //筛选抽屉
 
 export default {
@@ -314,7 +313,6 @@ export default {
 		tuiLoadmore,
 		tuiNomore,
 		orderButton,
-		tuiSkeleton,
 		modalLayer,
 		shareAlert,
 		cmOrderDrawer

pages/seller/order/search-order.vue

@@ -251,7 +251,7 @@ import tuiNomore from '@/components/tui-components/nomore/nomore'
 import orderButton from './components/sellerOrderButton' //按钮
 import modalLayer from '@/components/modal-layer'
 import empty from '@/components/empty'
-import shareAlert from '@/components/cm-module/modelAlert/sellerShareAlert' //分享弹窗
+import shareAlert from './components/sellerShareAlert.vue' //分享弹窗
 import authorize from '@/common/config/authorize.js'
 const defaultListQuery = {
 	pageNum: 1, // 页码

pages/supplier/components/home.vue

@@ -30,7 +30,6 @@
 </template>
 
 <script>
-	import tuiSkeleton from '@/components/tui-skeleton/tui-skeleton'
 	import authorize from '@/common/config/authorize.js'
 	import customer from '@/components/cm-module/homeIndex/customer.vue'
 	import banner from '@/components/cm-module/homeIndex/banner.vue'
@@ -44,7 +43,6 @@
 	import { mapState,mapMutations} from 'vuex'
 	export default {
 		components:{
-			tuiSkeleton,
 			customer,
 			banner,
 			navbars,

pages/supplier/components/user.vue

@@ -182,13 +182,9 @@
 </template>
 <script>
 import authorize from '@/common/config/authorize.js'
-import uniBadge from '@/components/uni-badge/uni-badge.vue'
 import { mapState, mapMutations } from 'vuex'
 
 export default {
-	components: {
-		uniBadge
-	},
 	data() {
 		return {
 			nvabarData: {

pages/supplier/order/order-details.vue

@@ -123,7 +123,7 @@
 	import orderAddress from '@/components/cm-module/orderDetails/orderAddress' 		 //地址信息
 	import goodsList from '@/components/cm-module/orderDetails/goodsList'		 		 //商品列表
 	import orderButton from './components/supplierDetaileButton'	//底部按钮
-	import shareAlert from '@/components/cm-module/modelAlert/supplierShareAlert'	  //分享弹窗
+	import shareAlert from '../components/supplierShareAlert'	  //分享弹窗
 	export default {
 		components:{
 			headerBack,

pages/supplier/order/order-list.vue

@@ -111,7 +111,7 @@
 	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
 	import tuiNomore from "@/components/tui-components/nomore/nomore"
 	import orderButton from './components/supplierListButton'//底部按钮
-	import shareAlert from '@/components/cm-module/modelAlert/supplierShareAlert'	  //分享弹窗
+	import shareAlert from '../components/supplierShareAlert'	  //分享弹窗
 	import modalLayer from "@/components/modal-layer"
 	import empty from "@/components/empty";
 	import { mapState,mapMutations } from 'vuex'

pages/tabBar/cart/cart.vue

@@ -235,7 +235,6 @@
 </template>
 <script>
 	import authorize from '@/common/config/authorize.js'
-	import tuiSkeleton from "@/components/tui-skeleton/tui-skeleton"
 	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
 	import tuiNomore from "@/components/tui-components/nomore/nomore"
 	import activiPopup from "@/components/cm-module/productDetails/cm-activipopu"
@@ -245,7 +244,6 @@
 	
 	export default{
 		components:{
-			tuiSkeleton,
 			tuiLoadmore,
 			tuiNomore,
 			activiPopup,

pages/tabBar/home/index.vue

@@ -51,7 +51,6 @@
 </template>
 
 <script>
-import tuiSkeleton from '@/components/tui-skeleton/tui-skeleton'
 import authorize from '@/common/config/authorize.js'
 import customer from '@/components/cm-module/homeIndex/customer.vue'
 import banner from '@/components/cm-module/homeIndex/banner.vue'
@@ -68,7 +67,6 @@ import activityBean from '@/components/cm-module/activity/activityBean.vue'
 import { mapState, mapMutations } from 'vuex'
 export default {
 	components: {
-		tuiSkeleton,
 		customer,
 		banner,
 		navbars,

pages/tabBar/user/user.vue

@@ -374,14 +374,12 @@
 	</view>
 </template>
 <script>
-import uniBadge from '@/components/uni-badge/uni-badge.vue'
 import activityBean from '@/components/cm-module/activity/activityBean.vue'
 import authorize from '@/common/config/authorize.js'
 import { mapState, mapMutations } from 'vuex'
 
 export default {
 	components: {
-		uniBadge,
 		activityBean
 	},
 	data() {

pages/user/order/order-list.vue

@@ -247,7 +247,6 @@
 <script>
 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 tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
 import tuiNomore from '@/components/tui-components/nomore/nomore'
 import orderButton from '@/components/cm-module/orderDetails/orderListButton' //按钮
@@ -265,7 +264,6 @@ export default {
 		tuiLoadmore,
 		tuiNomore,
 		orderButton,
-		tuiSkeleton,
 		modalLayer,
 		shareAlert,
 		orderModel,

services/beautyArchive.service.js

@@ -22,7 +22,7 @@ export default class BeautyArchiveService {
         return this.AjaxService.get({
             url: '/commodity/product/archive/detail',
             data,
-            isLoading: true,
+            isLoading: false,
               
         })
     }