瀏覽代碼

整理项目组件

zhengjinyi 2 年之前
父節點
當前提交
383abe5c22
共有 41 個文件被更改,包括 33 次插入249 次删除
  1. 0 88
      components/cm-module/productDetails/second-attributes.vue
  2. 0 43
      components/cm-module/productDetails/secondBrand.vue
  3. 0 73
      components/cm-module/productDetails/secondDeatail.vue
  4. 0 0
      pages/goods/components/cm-attributes.vue
  5. 0 0
      pages/goods/components/cm-parameter.vue
  6. 0 0
      pages/goods/components/cm-price.vue
  7. 0 0
      pages/goods/components/cm-product-doc.vue
  8. 0 0
      pages/goods/components/cm-service.vue
  9. 0 0
      pages/goods/components/instrument-recommend.vue
  10. 0 0
      pages/goods/components/recommend.vue
  11. 1 1
      pages/goods/goods-doc-detail.vue
  12. 2 14
      pages/goods/instrument-details.vue
  13. 9 9
      pages/goods/product.vue
  14. 0 0
      pages/second/product/components/secondParameters.vue
  15. 0 0
      pages/second/product/components/secondPrice.vue
  16. 0 0
      pages/second/product/components/secondRecommend.vue
  17. 3 3
      pages/second/product/product-details.vue
  18. 1 1
      pages/seller/cart/buyagain.vue
  19. 0 0
      pages/seller/cart/components/buyagainList.vue
  20. 0 0
      pages/seller/cart/components/immediatelyList.vue
  21. 0 0
      pages/seller/cart/components/secondHand.vue
  22. 1 1
      pages/seller/cart/immediately.vue
  23. 1 1
      pages/seller/cart/second.vue
  24. 0 0
      pages/seller/order/components/sellerAddress.vue
  25. 0 0
      pages/seller/order/components/sellerClubVisible.vue
  26. 0 0
      pages/seller/order/components/sellerCoupon.vue
  27. 0 0
      pages/seller/order/components/sellerExchangeCoupon.vue
  28. 0 0
      pages/seller/order/components/sellerFreight.vue
  29. 0 0
      pages/seller/order/components/sellerGoodsList.vue
  30. 0 0
      pages/seller/order/components/sellerInvoice.vue
  31. 0 0
      pages/seller/order/components/sellerRegulations.vue
  32. 8 8
      pages/seller/order/create-order.vue
  33. 0 0
      pages/user/order/components/choiceAddress.vue
  34. 0 0
      pages/user/order/components/coupon.vue
  35. 0 0
      pages/user/order/components/exchangeCoupon.vue
  36. 0 0
      pages/user/order/components/freight.vue
  37. 0 0
      pages/user/order/components/goodsList.vue
  38. 0 0
      pages/user/order/components/invoiceTent.vue
  39. 6 6
      pages/user/order/create-order.vue
  40. 0 0
      pages/user/regularPurchase/components/productList.vue
  41. 1 1
      pages/user/regularPurchase/regularPurchase.vue

+ 0 - 88
components/cm-module/productDetails/second-attributes.vue

@@ -1,88 +0,0 @@
-<template name="cm-attributes">
-	<!-- 二手商品详情-->
-	<view class="cm-attributes">
-		<view class="wrap-info">
-			<view class="info-viewT" :class="goodsData.isNoneDisabled ? 'none' : ''">
-				<view class="info-viewL tui-skeleton-fillet">品牌:<text>{{product.brandName}}</text></view>
-				<view class="info-viewL tui-skeleton-fillet">分类:<text>{{product.typeStr}}</text></view>
-				<view class="info-viewL tui-skeleton-fillet">商品成色:<text>{{product.productQuality}}</text></view>
-				<view class="info-viewL tui-skeleton-fillet" v-if="product.fixedYears!=''">出厂日期:<text>{{product.fixedYears}}</text></view>
-				<view class="info-viewL tui-skeleton-fillet" v-if="product.showContactFlag==2">联系人:<text>{{product.contactName}}</text></view>
-				<view class="info-viewL tui-skeleton-fillet" v-if="product.showContactFlag==2">联系方式:<text>{{product.contactMobile}}</text></view>
-				<view class="info-viewL tui-skeleton-fillet" v-if="product.productType!=null||product.productType!=''">商品类型:<text v-if="product.productType==1">医美</text><text v-else>非医美</text></view>
-			</view>
-			<view class="info-viewT" :class="goodsData.isNoneDisabled ? 'none' : ''" v-if="product.secondHandType==2">
-				<view class="info-viewL tui-skeleton-fillet">市场价:<text>{{product.normalPriceStr}}</text></view>	
-			    <view class="info-viewL tui-skeleton-fillet">采购价/原价:<text>{{product.originalPriceStr}}</text></view>
-				<view class="info-viewL tui-skeleton-fillet">产品到期日:<text>{{product.maturityYears}}</text></view>	
-				<view class="info-viewL tui-skeleton-fillet">库存:<text>{{product.stock}}</text></view>	
-			</view>
-			<view class="info-viewT" :class="goodsData.isNoneDisabled ? 'none' : ''">
-				<view class="info-viewL tui-skeleton-fillet">所在地:<text>{{product.provinceCityDistrict}}</text></view>
-		   </view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default{
-		name:'cm-attributes',
-		props:{
-			product:{
-				type:Object,
-				default: {}
-			},
-			goodsData:{
-				type:Object,
-				default: {}
-			},
-		},
-		data() {
-			return{
-				
-			}
-		},
-		created() {
-			
-		},
-		methods:{
-		},
-		
-	}
-</script>
-
-<style lang="scss">	
-	.bmCode{
-	float: left;
-	width: 702rpx;
-	padding: 20rpx 24rpx 0 24rpx;
-	border-bottom: 1px solid #F8F8F8	
-	}
-	.tui-skeleton-fillet{
-	color:#999999 ;
-	}
-	.tui-skeleton-fillet text{
-	color: #333333;
-	}
-</style>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

+ 0 - 43
components/cm-module/productDetails/secondBrand.vue

@@ -1,43 +0,0 @@
-<template name="secondBrand">
-	<view class="secondBrand">
-		<view class="secondBrand-empty" v-if="product.brandInfo==''||product.brandInfo==null">暂无品牌信息</view>
-		<p v-else>{{product.brandInfo}}</p>
-	</view>
-</template>
-
-<script>
-	export default{
-		name:'secondBrand',
-		data(){
-			return{
-			 }
-			},
-			props:{
-				product:{
-					type:Object,
-				},
-			}
-		}
-</script>
-
-<style>
-	.secondBrand{
-		width: 702rpx;
-		margin: auto;
-	}
-	.secondBrand p{
-		padding: 20rpx;
-		font-size: 28rpx;
-		color: #666666;
-		line-height: 48rpx
-	}
-	.secondBrand-empty{
-		width: 702rpx;
-		height: 100rpx;
-		line-height: 100rpx;
-		padding: 0 24rpx;
-		font-size: 28rpx;
-		color: #999999;
-		text-align: center;
-	}
-</style>

+ 0 - 73
components/cm-module/productDetails/secondDeatail.vue

@@ -1,73 +0,0 @@
-<template name="secondDeatail">
-	<view class="secondDeatail clearfix">
-		<view class="Disclaimer">
-			<h3>免责声明:</h3>
-			<p>
-				鉴于本网站提供的二手版块信息包括但不限于公司名称,商品的简介、性能、描述与说明,相关图片、视频等均由卖家自行提供,由卖家对其提供的信息承担相应法律责任。买家应自行甄别商品信息并查验商品性状。本网站对二手版块中买卖双方的交易不提供任何形式的担保与保证,特此声明!
-			</p>
-	    </view>
-		<view class="contentHtml">
-			<view class="detailsText" v-if="product.productDetails!=''||product.productDetails!=null"  >{{product.productDetails}}</view>
-			   <view class="imgList" v-for="(item, index) in product.imageList" :key="index" :data-src="item">
-				   <img :src="item"/>
-			   </view>
-		</view>
-		
-	</view>
-</template>
-
-<script>
-	import authorize from '@/common/config/authorize.js'
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	
-	export default{
-		name:'secondDeatail',
-		props:{
-			product:{
-				type:Object,
-			  }
-			},
-		data() {
-			return{
-			}
-		},
-		}
-</script>
-
-<style>
-	.Disclaimer{
-		width: 702rpx;
-		background: #F7F7F7;
-		color:#333333 ;
-		line-height: 48rpx;
-		margin:20rpx auto;
-		border-radius: 4rpx;
-		}
-		.Disclaimer h3{
-		color: 28rpx;
-		padding: 20rpx 15rpx 0rpx 15rpx
-		}
-		.Disclaimer ._p{
-		font-size: 24rpx;
-		color: #666666;
-		padding: 10rpx 15rpx;
-		}
-		.imgList{
-			width: 702rpx; 
-			margin: auto;
-			height: 710rpx;
-			margin-bottom: 20rpx;
-		}
-		.imgList img{
-			width: 100%;
-			height: 100%;
-			
-		}
-		.detailsText{
-			padding: 0 30rpx 30rpx 30rpx;
-			color: #333333;
-			font-size: 24rpx;
-			text-align: left;
-		}
-</style>

+ 0 - 0
components/cm-module/productDetails/cm-attributes.vue → pages/goods/components/cm-attributes.vue


+ 0 - 0
components/cm-module/productDetails/cm-parameter.vue → pages/goods/components/cm-parameter.vue


+ 0 - 0
components/cm-module/productDetails/cm-price.vue → pages/goods/components/cm-price.vue


+ 0 - 0
components/cm-module/productDetails/cm-product-doc.vue → pages/goods/components/cm-product-doc.vue


+ 0 - 0
components/cm-module/productDetails/cm-service.vue → pages/goods/components/cm-service.vue


+ 0 - 0
components/cm-module/productDetails/instrument-recommend.vue → pages/goods/components/instrument-recommend.vue


+ 0 - 0
components/cm-module/productDetails/recommend.vue → pages/goods/components/recommend.vue


+ 1 - 1
pages/goods/goods-doc-detail.vue

@@ -21,7 +21,7 @@
 
 <script>
 import { mapState } from 'vuex'
-import cmProductDoc from '@/components/cm-module/productDetails/cm-product-doc.vue'
+import cmProductDoc from './components/cm-product-doc.vue'
 export default {
     components: {
         cmProductDoc

+ 2 - 14
pages/goods/instrument-details.vue

@@ -128,29 +128,17 @@
 
 <script>
 	import { mapState,mapMutations } from 'vuex'
-	import customP from '@/components/cm-custom/custom-p.vue' 		 //自定义导航
-	import cmPrice from "@/components/cm-module/productDetails/cm-price.vue" //价格显示
-	import cmAttributes from "@/components/cm-module/productDetails/cm-attributes.vue" //规格信息
 	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 recommend from "@/components/cm-module/productDetails/instrument-recommend" //相关推荐
-	import cmParameter from "@/components/cm-module/productDetails/cm-parameter" //相关参数
-	import cmService from "@/components/cm-module/productDetails/cm-service" //服务项目
+	import customP from '@/components/cm-custom/custom-p.vue' 		 //自定义导航
+	import recommend from "./components/instrument-recommend" //相关推荐
 	import wxLogin from "@/common/config/wxLogin.js"
 	var isPreviewImg;
 	export default{
 		components:{
-			uniStars,
 			customP,
 			parser,
-			tuiSkeleton,
 			recommend,
-			cmPrice,
-			cmAttributes,
-			cmParameter,
-			cmService
 		},
 		data(){
 			return{			

+ 9 - 9
pages/goods/product.vue

@@ -316,11 +316,11 @@
 					<view class="product-details recommend product-details3">
 						<view class="title"> <view class="title-tab">相关推荐</view> </view>
 						<view class="content hot">
-							<recommend
+							<cm-recommend
 								:query-productid="product.productId"
 								:query-type="product.recommendType"
 								v-if="isRequest"
-							></recommend>
+							></cm-recommend>
 						</view>
 					</view>
 				</view>
@@ -674,14 +674,14 @@
 <script>
 import { mapState, mapMutations } from 'vuex'
 import customP from '@/components/cm-module/headerNavbar/header-poduct' //自定义导航
-import cmPrice from '@/components/cm-module/productDetails/cm-price.vue' //价格显示
-import cmAttributes from '@/components/cm-module/productDetails/cm-attributes.vue' //规格信息
 import parser from '@/components/jyf-Parser/index' //富文本处理
 import tuiSkeleton from '@/components/tui-skeleton/tui-skeleton'
-import recommend from '@/components/cm-module/productDetails/recommend' //相关推荐
-import cmParameter from '@/components/cm-module/productDetails/cm-parameter' //相关参数
-import cmService from '@/components/cm-module/productDetails/cm-service' //服务项目
-import cmProductDoc from '@/components/cm-module/productDetails/cm-product-doc.vue'
+import cmPrice from './components/cm-price.vue' //价格显示
+import cmAttributes from './components/cm-attributes.vue' //规格信息
+import cmRecommend from './components/recommend' //相关推荐
+import cmParameter from './components/cm-parameter' //相关参数
+import cmService from './components/cm-service' //服务项目
+import cmProductDoc from './components/cm-product-doc.vue'
 import couponTabs from '@/components/cm-module/coupon/tui-tabs.vue'
 import authorize from '@/common/config/authorize.js'
 import wxLogin from '@/common/config/wxLogin.js'
@@ -695,7 +695,7 @@ export default {
 		customP,
 		parser,
 		tuiSkeleton,
-		recommend,
+		cmRecommend,
 		cmPrice,
 		cmAttributes,
 		cmParameter,

+ 0 - 0
components/cm-module/productDetails/secondParameters.vue → pages/second/product/components/secondParameters.vue


+ 0 - 0
components/cm-module/productDetails/secondPrice.vue → pages/second/product/components/secondPrice.vue


+ 0 - 0
components/cm-module/productDetails/secondRecommend.vue → pages/second/product/components/secondRecommend.vue


+ 3 - 3
pages/second/product/product-details.vue

@@ -143,12 +143,12 @@
 <script>
 	import { mapState,mapMutations } from 'vuex'
 	import customP from '@/components/cm-module/headerNavbar/header-poduct' 		 //自定义导航
-	import secondPrice from '@/components/cm-module/productDetails/secondPrice.vue' //价格显示
+	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/cm-module/productDetails/secondRecommend' //相关推荐
-	import cmParameter from '@/components/cm-module/productDetails/secondParameters.vue' //相关参数
+	import recommend from './components/secondRecommend' //相关推荐
+	import cmParameter from './components/secondParameters.vue' //相关参数
 	import wxLogin from '@/common/config/wxLogin.js'
 	import { debounce } from '@/common/config/common.js'
 	var isPreviewImg

+ 1 - 1
pages/seller/cart/buyagain.vue

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

+ 0 - 0
components/cm-module/listTemplate/buyagainList.vue → pages/seller/cart/components/buyagainList.vue


+ 0 - 0
components/cm-module/listTemplate/immediatelyList.vue → pages/seller/cart/components/immediatelyList.vue


+ 0 - 0
components/cm-module/listTemplate/secondHand.vue → pages/seller/cart/components/secondHand.vue


+ 1 - 1
pages/seller/cart/immediately.vue

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

+ 1 - 1
pages/seller/cart/second.vue

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

+ 0 - 0
components/cm-module/creatOrder/sellerAddress.vue → pages/seller/order/components/sellerAddress.vue


+ 0 - 0
components/cm-module/creatOrder/sellerClubVisible.vue → pages/seller/order/components/sellerClubVisible.vue


+ 0 - 0
components/cm-module/creatOrder/sellerCoupon.vue → pages/seller/order/components/sellerCoupon.vue


+ 0 - 0
components/cm-module/creatOrder/sellerExchangeCoupon.vue → pages/seller/order/components/sellerExchangeCoupon.vue


+ 0 - 0
components/cm-module/creatOrder/sellerFreight.vue → pages/seller/order/components/sellerFreight.vue


+ 0 - 0
components/cm-module/creatOrder/sellerGoodsList.vue → pages/seller/order/components/sellerGoodsList.vue


+ 0 - 0
components/cm-module/creatOrder/sellerInvoice.vue → pages/seller/order/components/sellerInvoice.vue


+ 0 - 0
components/cm-module/creatOrder/sellerRegulations.vue → pages/seller/order/components/sellerRegulations.vue


+ 8 - 8
pages/seller/order/create-order.vue

@@ -149,15 +149,15 @@
 </template>
 
 <script>
-	import choiceAddress from '@/components/cm-module/creatOrder/sellerAddress'  
-	import sellerGoodsList from '@/components/cm-module/creatOrder/sellerGoodsList'
-	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 sellerCoupon from '@/components/cm-module/creatOrder/sellerCoupon'
-	import sellerExchangeCoupon from '@/components/cm-module/creatOrder/sellerExchangeCoupon'
-	import sellerClubVisible from '@/components/cm-module/creatOrder/sellerClubVisible'
-	import sellerRegulations from '@/components/cm-module/creatOrder/sellerRegulations.vue'
+	import choiceAddress from './components/sellerAddress'  
+	import sellerGoodsList from './components/sellerGoodsList'
+	import sellerInvoice from './components/sellerInvoice'
+	import sellerFreight from './components/sellerFreight'
+	import sellerCoupon from './components/sellerCoupon'
+	import sellerExchangeCoupon from './components/sellerExchangeCoupon'
+	import sellerClubVisible from './components/sellerClubVisible'
+	import sellerRegulations from './components/sellerRegulations.vue'
 	
 	export default {
 		components:{

+ 0 - 0
components/cm-module/creatOrder/choiceAddress.vue → pages/user/order/components/choiceAddress.vue


+ 0 - 0
components/cm-module/creatOrder/coupon.vue → pages/user/order/components/coupon.vue


+ 0 - 0
components/cm-module/creatOrder/exchangeCoupon.vue → pages/user/order/components/exchangeCoupon.vue


+ 0 - 0
components/cm-module/creatOrder/freight.vue → pages/user/order/components/freight.vue


+ 0 - 0
components/cm-module/creatOrder/goodsList.vue → pages/user/order/components/goodsList.vue


+ 0 - 0
components/cm-module/creatOrder/invoiceTent.vue → pages/user/order/components/invoiceTent.vue


+ 6 - 6
pages/user/order/create-order.vue

@@ -121,12 +121,12 @@
 </template>
 <script>
 	import { mapState, mapMutations } from 'vuex'
-	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 coupon from '@/components/cm-module/creatOrder/coupon'
-	import exchangeCoupon from '@/components/cm-module/creatOrder/exchangeCoupon'
-	import freight from '@/components/cm-module/creatOrder/freight'
+	import choiceAddress from './components/choiceAddress'
+	import goodsList from './components/goodsList'
+	import invoiceTent from './components/invoiceTent'
+	import coupon from './components/coupon'
+	import exchangeCoupon from './components/exchangeCoupon'
+	import freight from './components/freight'
 	import freightAlert from '@/components/cm-module/modelAlert/freightAlert'
 	export default {
 		components:{

+ 0 - 0
components/cm-module/listTemplate/productList.vue → pages/user/regularPurchase/components/productList.vue


+ 1 - 1
pages/user/regularPurchase/regularPurchase.vue

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