yuxingxing 2 years ago
parent
commit
778c15a083

+ 0 - 165
components/goodList/index.vue

@@ -1,165 +0,0 @@
-<template>
-	<view class='goodList'>
-		<scroll-view scroll-y="true" scroll-with-animation='true' style="height: 100%;">
-
-			<block v-for="(item,index) in bastList" :key="index">
-				<view @click="goDetail(item)" class='item acea-row row-between-wrapper' hover-class="none">
-					<view class='pictrue'>
-						<image :src='item.image'></image>
-						<span class="pictrue_log pictrue_log_class"
-							v-if="item.activity && item.activity.type === '1'">{{$t(`秒杀`)}}</span>
-						<span class="pictrue_log pictrue_log_class"
-							v-if="item.activity && item.activity.type === '2'">{{$t(`砍价`)}}</span>
-						<span class="pictrue_log pictrue_log_class"
-							v-if="item.activity && item.activity.type === '3'">{{$t(`拼团`)}}</span>
-					</view>
-					<view class='underline'>
-						<view class='text'>
-							<view class='line1'>{{item.store_name}}</view>
-							<view class='money font-color'>{{$t(`¥`)}}<text class='num'>{{item.price}}</text></view>
-							<view class='vip-money acea-row row-middle'
-								v-if="item.is_vip && item.vip_price && item.vip_price > 0">{{$t(`¥`)}}{{item.vip_price || 0}}
-								<image src='../../static/images/vip.png'></image><text
-									class='num'>{{$t(`已售`)}} {{item.sales}}{{$t(item.unit_name)}}</text>
-							</view>
-							<view class='vip-money acea-row row-middle' v-else><text
-									class='num'>{{$t(`已售`)}} {{item.sales}}{{$t(item.unit_name)}}</text></view>
-						</view>
-					</view>
-					<!-- <view class='iconfont icon-gouwuche cart-color acea-row row-center-wrapper'></view> -->
-				</view>
-			</block>
-		</scroll-view>
-	</view>
-</template>
-
-<script>
-	import {
-		mapGetters
-	} from "vuex";
-	import {
-		goShopDetail,
-		goPage
-	} from '@/libs/order.js'
-	export default {
-		computed: mapGetters(['uid']),
-		props: {
-			status: {
-				type: Number,
-				default: 0,
-			},
-			bastList: {
-				type: Array,
-				default: function() {
-					return [];
-				}
-			}
-		},
-		data() {
-			return {
-
-			};
-		},
-		methods: {
-			goDetail(item) {
-				goPage().then(res => {
-					goShopDetail(item, this.uid).then(res => {
-						uni.navigateTo({
-							url: `/pages/goods_details/index?id=${item.id}`
-						})
-					})
-				})
-
-			}
-
-		}
-	}
-</script>
-
-<style scoped lang='scss'>
-	.goodList .item {
-		position: relative;
-		padding-left: 30rpx;
-	}
-
-	.goodList .item .pictrue {
-		width: 180rpx;
-		height: 180rpx;
-		position: relative;
-	}
-
-	.goodList .item .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 20rpx;
-	}
-
-	.goodList .item .pictrue .numPic {
-		position: absolute;
-		left: 7rpx;
-		top: 7rpx;
-		width: 40rpx;
-		height: 40rpx;
-		border-radius: 50%;
-	}
-
-	.goodList .item .underline {
-		padding: 30rpx 30rpx 30rpx 0;
-		border-bottom: 1px solid #f5f5f5;
-	}
-
-	.goodList .item:nth-last-child(1) .underline {
-		border-bottom: 0;
-	}
-
-	.goodList .item .text {
-		font-size: 30rpx;
-		color: #222;
-		width: 489rpx;
-	}
-
-	.goodList .item .text .money {
-		font-size: 26rpx;
-		font-weight: bold;
-		margin-top: 50rpx;
-	}
-
-	.goodList .item .text .money .num {
-		font-size: 34rpx;
-	}
-
-	.goodList .item .text .vip-money {
-		font-size: 24rpx;
-		color: #282828;
-		font-weight: bold;
-		margin-top: 15rpx;
-	}
-
-	.goodList .item .text .vip-money image {
-		width: 66rpx;
-		height: 25rpx;
-		margin-right: 8rpx;
-		margin-left: 8rpx;
-	}
-
-	.goodList .item .text .vip-money .num {
-		font-size: 22rpx;
-		color: #aaa;
-		font-weight: normal;
-		margin-top: -2rpx;
-
-		~.num {
-			margin-left: 22rpx;
-		}
-	}
-
-	.goodList .item .iconfont {
-		position: absolute;
-		right: 30rpx;
-		width: 50rpx;
-		height: 50rpx;
-		border-radius: 50%;
-		font-size: 30rpx;
-		bottom: 38rpx;
-	}
-</style>

+ 2 - 19
main.js

@@ -35,12 +35,8 @@ Vue.prototype.$wechat = Auth;
 
 
 
-let cookieName = "VCONSOLE",
-	query = parseQuery(),
-	urlSpread = query["spread"],
-	vconsole = query[cookieName.toLowerCase()],
-	md5Crmeb = "b14d1e9baeced9bb7525ab19ee35f2d2", //CRMEB MD5 加密开启vconsole模式
-	md5UnCrmeb = "3dca2162c4e101b7656793a1af20295c"; //UN_CREMB MD5 加密关闭vconsole模式
+let query = parseQuery(),
+	urlSpread = query["spread"]
 
 if (urlSpread !== undefined) {
 	var spread = Cache.get(SPREAD);
@@ -51,19 +47,6 @@ if (urlSpread !== undefined) {
 		Cache.set("spread", urlSpread || 0);
 	}
 }
-
-if (vconsole !== undefined) {
-  if (vconsole === md5UnCrmeb && Cache.has(cookieName))
-	  Cache.clear(cookieName);
-} else vconsole = Cache.get(cookieName);
-
-import VConsole from './pages/extension/components/vconsole.min.js'
-
-if (vconsole !== undefined && vconsole === md5Crmeb) {
-	Cache.set(cookieName, md5Crmeb, 3600);
-	let vConsole = new VConsole();
-}
-
 // let snsapiBase = 'snsapi_base';
 // Auth.isWeixin() && Auth.oAuth(snsapiBase);
 

+ 1 - 3
pages/columnGoods/HotNewGoods/index.vue

@@ -21,7 +21,7 @@
 			<div class="line"></div>
 		</div>
 		<view class="wrapper">
-			<GoodList :bastList="goodsList" :is-sort="false"></GoodList>
+			<!-- <GoodList :bastList="goodsList" :is-sort="false"></GoodList> -->
 			<emptyPage v-if="goodsList.length == 0 && !isScroll" :title="$t(`暂无数据`)"></emptyPage>
 		</view>
 		<!-- #ifndef MP -->
@@ -32,7 +32,6 @@
 </template>
 <script>
 	import emptyPage from '@/components/emptyPage.vue';
-	import GoodList from '@/components/goodList';
 	import pageFooter from '@/components/pageFooter/index.vue';
 	import {
 		getGroomList
@@ -45,7 +44,6 @@
 	export default {
 		name: 'HotNewGoods',
 		components: {
-			GoodList,
 			emptyPage,
 			home,
 			pageFooter

+ 0 - 0
components/orderGoods/index_details_mall.vue → pages/goods/orderGoods/index_details_mall.vue


+ 0 - 0
components/orderGoods/index_mall.vue → pages/goods/orderGoods/index_mall.vue


+ 1 - 1
pages/goods/order_confirm/index.vue

@@ -262,7 +262,7 @@ import {
 } from '@/config/cache.js';
 import couponListWindow from '@/components/couponListWindow';
 import addressWindow from '@/components/addressWindow';
-import orderGoods from '@/components/orderGoods/index_mall';
+import orderGoods from '@/pages/goods/orderGoods/index_mall';
 import home from '@/components/home';
 import invoicePicker from '../components/invoicePicker/index.vue';
 import {

+ 1 - 1
pages/goods/order_details/index.vue

@@ -374,7 +374,7 @@ import {
 } from '@/api/user.js';
 import home from '@/components/home';
 import payment from '@/components/payment';
-import orderGoods from "@/components/orderGoods/index_details_mall";
+import orderGoods from "@/pages/goods/orderGoods/index_details_mall";
 import ClipboardJS from "@/plugin/clipboard/clipboard.js";
 import {
 	toLogin

+ 3 - 5
pages/users/message_center/index.vue

@@ -35,7 +35,7 @@
 		</view>
 		<view class="list" v-if="list.length && type === 0">
 			<view v-for="(item, index) in list" :key="index">
-				<tuiDrawer @click="(e)=>bindClick(e,item)" :key="item.id" :actions="!item.look ? actions :actionsIsLook"
+				<!-- <tuiDrawer @click="(e)=>bindClick(e,item)" :key="item.id" :actions="!item.look ? actions :actionsIsLook"
 					:params="{id:item.id}">
 					<template v-slot:content>
 						<view class="item" @click="goDetail(item.id)">
@@ -57,7 +57,7 @@
 
 					</template>
 
-				</tuiDrawer>
+				</tuiDrawer> -->
 			</view>
 		</view>
 		<view v-else-if="finished && !list.length" class="empty-wrap">
@@ -80,15 +80,13 @@
 	} from '@/api/user.js';
 	import colors from '@/mixins/color.js';
 	import home from '@/components/home';
-	import tuiDrawer from '@/components/tuiDrawer/index.vue'
 	import {
 		HTTP_REQUEST_URL
 	} from '@/config/app';
 	export default {
 		mixins: [colors],
 		components: {
-			home,
-			tuiDrawer
+			home
 		},
 		data() {
 			return {