Kaynağa Gözat

采美模块更名替换

zhengjinyi 5 yıl önce
ebeveyn
işleme
80255e1b10
79 değiştirilmiş dosya ile 120 ekleme ve 108 silme
  1. 0 0
      components/cm-module/bottomMenu/bottomMenu.vue
  2. 0 0
      components/cm-module/creatOrder/choiceAddress.vue
  3. 0 0
      components/cm-module/creatOrder/freight.vue
  4. 0 0
      components/cm-module/creatOrder/goodsList.vue
  5. 0 0
      components/cm-module/creatOrder/invoiceTent.vue
  6. 0 0
      components/cm-module/creatOrder/sellerAddress.vue
  7. 0 0
      components/cm-module/creatOrder/sellerFreight.vue
  8. 0 0
      components/cm-module/creatOrder/sellerInvoice.vue
  9. 0 0
      components/cm-module/headerNavbar/header-back.vue
  10. 0 0
      components/cm-module/headerNavbar/header-poduct.vue
  11. 0 0
      components/cm-module/headerNavbar/headerNavbar.vue
  12. 0 0
      components/cm-module/home/navInfor.vue
  13. 0 0
      components/cm-module/home/navServer.vue
  14. 0 0
      components/cm-module/home/navigationTab.vue
  15. 1 1
      components/cm-module/listTemplate/buyagainList.vue
  16. 1 1
      components/cm-module/listTemplate/commodityList.vue
  17. 1 1
      components/cm-module/listTemplate/immediatelyList.vue
  18. 0 0
      components/cm-module/listTemplate/listSkeleton.vue
  19. 1 1
      components/cm-module/listTemplate/memberList.vue
  20. 1 1
      components/cm-module/listTemplate/productList.vue
  21. 0 0
      components/cm-module/listTemplate/richTextTemplate.vue
  22. 0 0
      components/cm-module/modelAlert/cancelAlert.vue
  23. 0 0
      components/cm-module/modelAlert/errorAlert.vue
  24. 0 0
      components/cm-module/modelAlert/freightAlert.vue
  25. 0 0
      components/cm-module/modelAlert/modelAlert.vue
  26. 0 0
      components/cm-module/modelAlert/shareAlert.vue
  27. 0 0
      components/cm-module/noLogin/nologin.vue
  28. 0 0
      components/cm-module/orderDetails/goodsList.vue
  29. 0 0
      components/cm-module/orderDetails/invoiceTent.vue
  30. 0 0
      components/cm-module/orderDetails/logisticsRecord.vue
  31. 0 0
      components/cm-module/orderDetails/orderAddress.vue
  32. 0 0
      components/cm-module/orderDetails/orderButton.vue
  33. 0 0
      components/cm-module/orderDetails/orderInformation.vue
  34. 0 0
      components/cm-module/orderDetails/orderListButton.vue
  35. 0 0
      components/cm-module/orderDetails/paymentRecord.vue
  36. 0 0
      components/cm-module/orderDetails/refundRecord.vue
  37. 0 0
      components/cm-module/orderDetails/sellerDetaileButton.vue
  38. 0 0
      components/cm-module/orderDetails/sellerOrderButton.vue
  39. 0 0
      components/cm-module/orderDetails/transfeRecord.vue
  40. 0 0
      components/cm-module/popupGoods/popupGoods.vue
  41. 0 0
      components/cm-module/productDetails/evaluate.vue
  42. 2 2
      components/cm-module/productDetails/productDetails.vue
  43. 0 0
      components/cm-module/productDetails/recommend.vue
  44. 0 0
      components/cm-module/productDetails/supplierDetails.vue
  45. 1 1
      components/uni-search/go-search.vue
  46. 1 1
      components/uni-search/or-search.vue
  47. 1 1
      market/pages/address/address.vue
  48. 1 1
      market/pages/cart/buyagain.vue
  49. 1 1
      market/pages/cart/immediately.vue
  50. 1 0
      market/pages/club/list.vue
  51. 2 2
      market/pages/login/login.vue
  52. 5 5
      market/pages/order/create-order.vue
  53. 5 5
      market/pages/order/myOrder.vue
  54. 10 10
      market/pages/order/order-details.vue
  55. 3 3
      market/pages/order/order-list.vue
  56. 7 7
      market/pages/order/order-sharedetails.vue
  57. 2 2
      market/pages/search/search-order.vue
  58. 7 8
      pages/authorization/authorization.vue
  59. 1 1
      pages/goods/goods.vue
  60. 4 6
      pages/goods/product.vue
  61. 2 2
      pages/search/search-order.vue
  62. 1 1
      pages/service/aftersale.vue
  63. 1 1
      pages/service/member.vue
  64. 1 1
      pages/service/organagree.vue
  65. 1 1
      pages/service/privacyagree.vue
  66. 1 1
      pages/service/shoppingnotice.vue
  67. 1 1
      pages/service/useragree.vue
  68. 16 2
      pages/tabBar/home/home.vue
  69. 1 1
      pages/user/about/about.vue
  70. 1 1
      pages/user/address/address.vue
  71. 5 5
      pages/user/order/create-order.vue
  72. 5 5
      pages/user/order/myOrder.vue
  73. 2 2
      pages/user/order/order-cashier.vue
  74. 10 10
      pages/user/order/order-details.vue
  75. 3 3
      pages/user/order/order-list.vue
  76. 7 7
      pages/user/order/order-sharedetails.vue
  77. 1 1
      pages/user/regularPurchase/regularPurchase.vue
  78. 1 1
      pages/user/setting/password.vue
  79. 1 1
      pages/user/setting/phone.vue

+ 0 - 0
components/module/bottomMenu/bottomMenu.vue → components/cm-module/bottomMenu/bottomMenu.vue


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


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


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


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


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


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


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


+ 0 - 0
components/module/headerNavbar/header-back.vue → components/cm-module/headerNavbar/header-back.vue


+ 0 - 0
components/module/headerNavbar/header-poduct.vue → components/cm-module/headerNavbar/header-poduct.vue


+ 0 - 0
components/module/headerNavbar/headerNavbar.vue → components/cm-module/headerNavbar/headerNavbar.vue


+ 0 - 0
components/module/home/navInfor.vue → components/cm-module/home/navInfor.vue


+ 0 - 0
components/module/home/navServer.vue → components/cm-module/home/navServer.vue


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


+ 1 - 1
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"

+ 1 - 1
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"

+ 1 - 1
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"

+ 0 - 0
components/module/listTemplate/listSkeleton.vue → components/cm-module/listTemplate/listSkeleton.vue


+ 1 - 1
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',

+ 1 - 1
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"

+ 0 - 0
components/module/listTemplate/richTextTemplate.vue → components/cm-module/listTemplate/richTextTemplate.vue


+ 0 - 0
components/module/modelAlert/cancelAlert.vue → components/cm-module/modelAlert/cancelAlert.vue


+ 0 - 0
components/module/modelAlert/errorAlert.vue → components/cm-module/modelAlert/errorAlert.vue


+ 0 - 0
components/module/modelAlert/freightAlert.vue → components/cm-module/modelAlert/freightAlert.vue


+ 0 - 0
components/module/modelAlert/modelAlert.vue → components/cm-module/modelAlert/modelAlert.vue


+ 0 - 0
components/module/modelAlert/shareAlert.vue → components/cm-module/modelAlert/shareAlert.vue


+ 0 - 0
components/module/noLogin/nologin.vue → components/cm-module/noLogin/nologin.vue


+ 0 - 0
components/module/orderDetails/goodsList.vue → components/cm-module/orderDetails/goodsList.vue


+ 0 - 0
components/module/orderDetails/invoiceTent.vue → components/cm-module/orderDetails/invoiceTent.vue


+ 0 - 0
components/module/orderDetails/logisticsRecord.vue → components/cm-module/orderDetails/logisticsRecord.vue


+ 0 - 0
components/module/orderDetails/orderAddress.vue → components/cm-module/orderDetails/orderAddress.vue


+ 0 - 0
components/module/orderDetails/orderButton.vue → components/cm-module/orderDetails/orderButton.vue


+ 0 - 0
components/module/orderDetails/orderInformation.vue → components/cm-module/orderDetails/orderInformation.vue


+ 0 - 0
components/module/orderDetails/orderListButton.vue → components/cm-module/orderDetails/orderListButton.vue


+ 0 - 0
components/module/orderDetails/paymentRecord.vue → components/cm-module/orderDetails/paymentRecord.vue


+ 0 - 0
components/module/orderDetails/refundRecord.vue → components/cm-module/orderDetails/refundRecord.vue


+ 0 - 0
components/module/orderDetails/sellerDetaileButton.vue → components/cm-module/orderDetails/sellerDetaileButton.vue


+ 0 - 0
components/module/orderDetails/sellerOrderButton.vue → components/cm-module/orderDetails/sellerOrderButton.vue


+ 0 - 0
components/module/orderDetails/transfeRecord.vue → components/cm-module/orderDetails/transfeRecord.vue


+ 0 - 0
components/module/popupGoods/popupGoods.vue → components/cm-module/popupGoods/popupGoods.vue


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


+ 2 - 2
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,

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


+ 0 - 0
components/module/productDetails/supplierDetails.vue → components/cm-module/productDetails/supplierDetails.vue


+ 1 - 1
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",

+ 1 - 1
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",

+ 1 - 1
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:{

+ 1 - 1
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{

+ 1 - 1
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:{

+ 1 - 0
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 () {//输入框失去焦点时触发

+ 2 - 2
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
 				}
 			})	

+ 5 - 5
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" 

+ 5 - 5
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,

+ 10 - 10
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:{

+ 3 - 3
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" 
 	

+ 7 - 7
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 {

+ 2 - 2
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" 

+ 7 - 8
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;

+ 1 - 1
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:{

+ 4 - 6
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" 
@@ -559,7 +559,6 @@
 		},
 		onShow() {
 			this.$api.getStorage().then((resolve) => {
-				console.log('2222222222')
 				this.userID = resolve.userID ? resolve.userID : '';	
 				this.userIdentity = resolve.userIdentity ? resolve.userIdentity : 3
 				if (isPreviewImg) {
@@ -569,7 +568,6 @@
 					this.initData();
 				}
 			}).catch(resolve =>{
-				console.log('1111111111')
 				this.initData();
 			})
 		}

+ 2 - 2
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, 

+ 1 - 1
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: {

+ 1 - 1
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:{

+ 1 - 1
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{

+ 1 - 1
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{

+ 1 - 1
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: {

+ 1 - 1
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{

+ 16 - 2
pages/tabBar/home/home.vue

@@ -22,6 +22,13 @@
 				<!-- </uni-swiper-dot> -->
 			</view>
 			<view class="cate-section clearfix">
+				<!-- 自定义分类导航栏 -->
+				<view class="tabbar clearfix">
+					<view class="cate-item" v-for="(nav,idx) in productsClassify" :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>
 				<!-- 优选分类 -->
 				<view class="tabbar clearfix">
 					<view class="cate-item-info" @click.stop="this.$api.navToListPage({type:'1',value:firstModulesName})">
@@ -171,6 +178,13 @@
 					{text:'会员中心',icon:'https://img.caimei365.com/group1/M00/03/8C/Cmis215XHXSAAZU0AACaPrfbB8I435.png'},
 					{text:'在线客服',icon:'https://img.caimei365.com/group1/M00/03/8D/Cmis215XHXWABv0rAACt9b8scec656.png'}
 				],
+				productsClassify:[
+					{classifyName:'针剂',classifyImage:'https://img.caimei365.com/group1/M00/03/7A/Cmis213wz86AQuJBAABgU_SS4II914.png'},
+					{classifyName:'线材/假体',classifyImage:'https://img.caimei365.com/group1/M00/03/7A/Cmis213wz-OAei3KAABf7oyhz8c939.png'},
+					{classifyName:'仪器',classifyImage:'https://img.caimei365.com/group1/M00/03/7A/Cmis213w0AeAJGGSAABlVRKhWFE375.png'},
+					{classifyName:'护肤',classifyImage:'https://img.caimei365.com/group1/M00/03/7A/Cmis213w0ByABQfJAABdoMz4qTo227.png'},
+					{classifyName:'易耗品',classifyImage:'https://img.caimei365.com/group1/M00/03/7A/Cmis213w0DKAKKaaAABbkEy5ilM324.png'}
+				],
 				navServerList:[
 					{text:'会员优惠',icon:'../../../static/temp/server1@2x.png',path:'/pages/service/member'},
 					{text:'售后无忧',icon:'../../../static/temp/server2@2x.png',path:'/pages/service/aftersale'},
@@ -267,8 +281,8 @@
 				console.log(e.detail.query)
 			},
 			showTost(){
-				// this.$util.msg("正在开发中,敬请期待~",2000)
-				this.$api.navigateTo(`/market/pages/login/login`)
+				this.$util.msg("正在开发中,敬请期待~",2000)
+				// this.$api.navigateTo(`/market/pages/login/login`)
 				// uni.navigateToMiniProgram({
 				// 	appId: 'wx5a5cda32926f55ac',
 				// 	path: '/pages/tabBar/home/home',

+ 1 - 1
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;

+ 1 - 1
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:{

+ 5 - 5
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" 

+ 5 - 5
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,

+ 2 - 2
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:{

+ 10 - 10
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:{

+ 3 - 3
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 {

+ 7 - 7
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 {

+ 1 - 1
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:{

+ 1 - 1
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

+ 1 - 1
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