Просмотр исходного кода

【模版目录】更新移动端页面源码

吴昊天 3 лет назад
Родитель
Сommit
bcc0747906
48 измененных файлов с 1320 добавлено и 1350 удалено
  1. 0 2
      template/uni-app/App.vue
  2. 1 1
      template/uni-app/components/couponWindow/index.vue
  3. 159 142
      template/uni-app/components/cusPreviewImg/index.vue
  4. 0 1
      template/uni-app/components/goodClass/index.vue
  5. 0 1
      template/uni-app/components/menuIcon.vue
  6. 0 2
      template/uni-app/components/orderGoods/index.vue
  7. 1 2
      template/uni-app/components/pageFooter/index.vue
  8. 0 1
      template/uni-app/components/shareRedPackets/index.vue
  9. 0 2
      template/uni-app/components/update/app-update.vue
  10. 540 541
      template/uni-app/components/verify/verifyPoint/verifyPoint.vue
  11. 0 2
      template/uni-app/libs/chat.js
  12. 10 9
      template/uni-app/mixins/sharePoster.js
  13. 3 3
      template/uni-app/pages/activity/goods_combination_details/index.vue
  14. 2 5
      template/uni-app/pages/activity/goods_seckill_details/index.vue
  15. 0 4
      template/uni-app/pages/activity/presell_details/index.vue
  16. 7 7
      template/uni-app/pages/admin/orderDetail/index.vue
  17. 0 1
      template/uni-app/pages/admin/orderList/index.vue
  18. 0 1
      template/uni-app/pages/admin/statistics/index.vue
  19. 0 2
      template/uni-app/pages/annex/applicationRecord/index.vue
  20. 0 2
      template/uni-app/pages/annex/settled/index.vue
  21. 0 3
      template/uni-app/pages/annex/special/index.vue
  22. 0 1
      template/uni-app/pages/extension/customer_list/chat.vue
  23. 5 0
      template/uni-app/pages/goods/goods_return/index.vue
  24. 1 1
      template/uni-app/pages/goods_cate/goods_cate1.vue
  25. 0 1
      template/uni-app/pages/goods_cate/goods_cate2.vue
  26. 0 2
      template/uni-app/pages/goods_cate/goods_cate3.vue
  27. 12 8
      template/uni-app/pages/goods_details/index.vue
  28. 0 1
      template/uni-app/pages/index/diy/components/articleList.vue
  29. 2 7
      template/uni-app/pages/index/diy/index.vue
  30. 0 2
      template/uni-app/pages/index/visualization/index.vue
  31. 6 7
      template/uni-app/pages/order_addcart/order_addcart.vue
  32. 0 2
      template/uni-app/pages/points_mall/integral_goods_details.vue
  33. 1 2
      template/uni-app/pages/user/index.vue
  34. 539 541
      template/uni-app/pages/users/components/verify/verifyPoint/verifyPoint.vue
  35. 0 1
      template/uni-app/pages/users/message_center/messageDetail.vue
  36. 0 1
      template/uni-app/pages/users/payment_on_behalf/index.vue
  37. 0 1
      template/uni-app/pages/users/payment_on_behalf/pay_status.vue
  38. 0 3
      template/uni-app/pages/users/promoter-order/index.vue
  39. 0 1
      template/uni-app/pages/users/staff_list/index.vue
  40. 0 1
      template/uni-app/pages/users/user_address/index.vue
  41. 0 2
      template/uni-app/pages/users/user_address_list/index.vue
  42. 0 1
      template/uni-app/pages/users/user_cash/index.vue
  43. 0 1
      template/uni-app/pages/users/user_distribution_level/index.vue
  44. 0 5
      template/uni-app/pages/users/user_goods_collection/index.vue
  45. 0 1
      template/uni-app/pages/users/user_info/index.vue
  46. 0 1
      template/uni-app/pages/users/user_pwd_edit/index.vue
  47. 31 20
      template/uni-app/pages/users/wechat_login/index.vue
  48. 0 2
      template/uni-app/utils/util.js

+ 0 - 2
template/uni-app/App.vue

@@ -188,7 +188,6 @@
 			const startParamObj = wx.getEnterOptionsSync();
 			if (wx.canIUse('getUpdateManager') && startParamObj.scene != 1154) {
 				const updateManager = wx.getUpdateManager()
-				console.log(updateManager);
 				updateManager.onCheckForUpdate(function(res) {
 					// 请求完新版本信息的回调
 					// console.log(res.hasUpdate)
@@ -234,7 +233,6 @@
 			that.globalData.navH = menuButtonInfo.top * 2 + menuButtonInfo.height / 2;
 			const version = uni.getSystemInfoSync().SDKVersion
 			if (Routine.compareVersion(version, '2.21.3') >= 0) {
-				console.log(version)
 				that.$Cache.set('MP_VERSION_ISNEW', true)
 			} else {
 				that.$Cache.set('MP_VERSION_ISNEW', false)

+ 1 - 1
template/uni-app/components/couponWindow/index.vue

@@ -15,7 +15,7 @@
 				</view>
 			</view>
 			<view class='lid'>
-				<navigator hover-class='none' url='/pages/users/user_get_coupon/index' class='bnt'>{{$t(`立即领取`)}}</navigator>
+				<navigator v-if="window" hover-class='none' url='/pages/users/user_get_coupon/index' class='bnt'>{{$t(`立即领取`)}}</navigator>
 				<view class='iconfont icon-guanbi3' @click="close"></view>
 			</view>
 		</view>

+ 159 - 142
template/uni-app/components/cusPreviewImg/index.vue

@@ -1,143 +1,160 @@
-<template>
-	<view class="previewImg" v-if="showBox" @touchmove.stop.prevent>
-		<view class="mask" @click="close">
-			<swiper @change="changeSwiper" class="mask-swiper" :current="currentIndex" :circular="circular" :duration="duration">
-				<swiper-item v-for="(src, i) in list" :key="i" class="flex flex-column justify-center align-center">
-					<image class="mask-swiper-img" :src="src.image" mode="widthFix" />
-					<view class="mask_sku">
-						<text class="sku_name">{{src.suk}}</text>
-						<text class="sku_price">{{$t(`¥`)}}{{src.price}}</text>
-					</view>
-				</swiper-item>
-			</swiper>
-		</view>
-		<view class="pagebox" v-if="list.length>0">{{ Number(currentIndex) + 1 }} / {{ list.length }}</view>
-		<!-- #ifndef MP -->
-		<!-- <text class="iconfont icon-fenxiang share_btn" @click="shareFriend()"></text> -->
-		<!-- #endif -->
-	</view>
-</template>
-
-<script>
-	export default {
-		name: 'cusPreviewImg',
-		props: {
-			list: {
-				type: Array,
-				required: true,
-				default: () => {
-					return [];
-				}
-			},
-			circular: {
-				type: Boolean,
-				default: true
-			},
-			duration: {
-				type: Number,
-				default: 500
-			}
-		},
-		data() {
-			return {
-				currentIndex: 0,
-				showBox: false
-			};
-		},
-		watch: {
-			list(val) {
-				// console.log('图片预览', val)
-			}
-		},
-		methods: {
-			// 左右切换
-			changeSwiper(e) {
-				this.currentIndex = e.target.current;
-				this.$emit('changeSwitch',e.target.current)
-			},
-			open(current) {
-				if (!current || !this.list.length) return;
-				this.currentIndex = this.list.map((item)=>item.suk).indexOf(current);
-				this.showBox = true;
-			},
-			close() {
-				this.showBox = false;
-			},
-			shareFriend(){
-				this.$emit('shareFriend')
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-@mixin full {
-	width: 100%;
-	height: 100%;
-}
-
-.previewImg {
-	position: fixed;
-	top: 0;
-	left: 0;
-	z-index: 300;
-	@include full;
-	.mask {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		background-color: #000;
-		opacity: 1;
-		z-index: 8;
-		@include full;
-		&-swiper {
-			@include full;
-			&-img {
-				width: 100%;
-			}
-		}
-	}
-	.pagebox{
-		position: absolute;
-		width: 100%;
-		bottom: 20rpx;
-		z-index: 300;
-		color: #fff;
-		text-align: center;
-	}
-}
-.mask_sku{
-	color: #fff;
-	max-width: 80%;
-	z-index: 300;
-	text-align: center;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	margin-top: 30rpx;
-	.sku_name{
-		font-size: 12px;
-		border: 1px solid #fff;
-		padding: 10rpx 30rpx 10rpx;
-		border-radius: 40px;
-		box-sizing: border-box;
-	}
-	.sku_price{
-		padding-top: 10px;
-	}
-}
-.font12{
-	font-size: 24rpx;
-}
-.share_btn{
-	position: absolute;
-	top:70rpx;
-	right:50rpx;
-	font-size: 40rpx;
-	color:#fff;
-	z-index: 300;
-}
-.flex-column{flex-direction: column;}
-.justify-center {justify-content: center;}
-.align-center {align-items: center;}
+<template>
+	<view class="previewImg" v-if="showBox" @touchmove.stop.prevent>
+		<view class="mask" @click="close">
+			<swiper @change="changeSwiper" class="mask-swiper" :current="currentIndex" :circular="circular"
+				:duration="duration">
+				<swiper-item v-for="(src, i) in list" :key="i" class="flex flex-column justify-center align-center">
+					<image class="mask-swiper-img" :src="src.image" mode="widthFix" />
+					<view class="mask_sku">
+						<text class="sku_name">{{src.suk}}</text>
+						<text class="sku_price">{{$t(`¥`)}}{{src.price}}</text>
+					</view>
+				</swiper-item>
+			</swiper>
+		</view>
+		<view class="pagebox" v-if="list.length>0">{{ Number(currentIndex) + 1 }} / {{ list.length }}</view>
+		<!-- #ifndef MP -->
+		<!-- <text class="iconfont icon-fenxiang share_btn" @click="shareFriend()"></text> -->
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'cusPreviewImg',
+		props: {
+			list: {
+				type: Array,
+				required: true,
+				default: () => {
+					return [];
+				}
+			},
+			circular: {
+				type: Boolean,
+				default: true
+			},
+			duration: {
+				type: Number,
+				default: 500
+			}
+		},
+		data() {
+			return {
+				currentIndex: 0,
+				showBox: false
+			};
+		},
+		watch: {
+			list(val) {}
+		},
+		methods: {
+			// 左右切换
+			changeSwiper(e) {
+				this.currentIndex = e.target.current;
+				this.$emit('changeSwitch', e.target.current)
+			},
+			open(current) {
+				if (!current || !this.list.length) return;
+				this.currentIndex = this.list.map((item) => item.suk).indexOf(current);
+				this.showBox = true;
+			},
+			close() {
+				this.showBox = false;
+			},
+			shareFriend() {
+				this.$emit('shareFriend')
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@mixin full {
+		width: 100%;
+		height: 100%;
+	}
+
+	.previewImg {
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 300;
+		@include full;
+
+		.mask {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			background-color: #000;
+			opacity: 1;
+			z-index: 8;
+			@include full;
+
+			&-swiper {
+				@include full;
+
+				&-img {
+					width: 100%;
+				}
+			}
+		}
+
+		.pagebox {
+			position: absolute;
+			width: 100%;
+			bottom: 20rpx;
+			z-index: 300;
+			color: #fff;
+			text-align: center;
+		}
+	}
+
+	.mask_sku {
+		color: #fff;
+		max-width: 80%;
+		z-index: 300;
+		text-align: center;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		margin-top: 30rpx;
+
+		.sku_name {
+			font-size: 12px;
+			border: 1px solid #fff;
+			padding: 10rpx 30rpx 10rpx;
+			border-radius: 40px;
+			box-sizing: border-box;
+		}
+
+		.sku_price {
+			padding-top: 10px;
+		}
+	}
+
+	.font12 {
+		font-size: 24rpx;
+	}
+
+	.share_btn {
+		position: absolute;
+		top: 70rpx;
+		right: 50rpx;
+		font-size: 40rpx;
+		color: #fff;
+		z-index: 300;
+	}
+
+	.flex-column {
+		flex-direction: column;
+	}
+
+	.justify-center {
+		justify-content: center;
+	}
+
+	.align-center {
+		align-items: center;
+	}
 </style>

+ 0 - 1
template/uni-app/components/goodClass/index.vue

@@ -89,7 +89,6 @@
 				this.$emit('ChangeCartNumDan', false, index, item);
 			},
 			CartNumAdd(index, item) {
-				console.log('2')
 				if (this.addIng) return
 				this.addIng = true
 				this.$emit('ChangeCartNumDan', true, index, item);

+ 0 - 1
template/uni-app/components/menuIcon.vue

@@ -104,7 +104,6 @@
 				// #ifdef MP
 				this.menuButton = uni.getMenuButtonBoundingClientRect();
 				const query = uni.createSelectorQuery().in(this);
-				console.log(this.menuButton)
 				query
 					.select('#home')
 					.boundingClientRect(data => {

+ 0 - 2
template/uni-app/components/orderGoods/index.vue

@@ -174,7 +174,6 @@
 				nVal.forEach((item, index) => {
 					num += item.cart_num
 				})
-				console.log(num)
 				this.totalNmu = num
 			}
 		},
@@ -184,7 +183,6 @@
 				this.cartInfo.forEach((item, index) => {
 					num += item.cart_num
 				})
-				console.log(num)
 				this.$set(this, 'totalNmu', num)
 			})
 

+ 1 - 2
template/uni-app/components/pageFooter/index.vue

@@ -103,7 +103,6 @@
 			let that = this
 			uni.hideTabBar()
 			this.newData = this.$store.state.app.pageFooter
-			console.log(this.newData)
 			if (this.isLogin) {
 				this.getCartNum()
 			}
@@ -169,7 +168,7 @@
 			justify-content: center;
 			flex-direction: column;
 			position: relative;
-
+			width: 100%;
 			.count-num {
 				position: absolute;
 				display: flex;

+ 0 - 1
template/uni-app/components/shareRedPackets/index.vue

@@ -50,7 +50,6 @@
 				this.$emit('closeChange');
 			},
 			goShare: function() {
-				console.log(this.isAnimate)
 				if (this.isAnimate) {
 					this.$emit('listenerActionSheet');
 				} else {

+ 0 - 2
template/uni-app/components/update/app-update.vue

@@ -121,7 +121,6 @@
 				//向后台发起请求,获取最新版本号
 				getUpdateInfo(this.platform === "ios" ? 2 : 1)
 					.then((res) => {
-						console.log(res)
 						if(Array.isArray(res.data)){
 						 return	this.$emit('isNew')
 						}
@@ -146,7 +145,6 @@
 					})
 					.catch((err) => {
 						vm.popup_show = false
-						console.log(err);
 					});
 			},
 			// 检查是否更新

Разница между файлами не показана из-за своего большого размера
+ 540 - 541
template/uni-app/components/verify/verifyPoint/verifyPoint.vue


+ 0 - 2
template/uni-app/libs/chat.js

@@ -40,8 +40,6 @@ Socket.prototype = {
 	},
 	onOpen() {
 		this.init();
-		console.log('创建连接了!')
-		
 		this.send({
 			type: "login",
 			data: $store.state.app.token

+ 10 - 9
template/uni-app/mixins/sharePoster.js

@@ -11,8 +11,12 @@ import {
 	imageBase64
 } from "@/api/public";
 import {
-	getProductCode
+	getProductCode, // 普通商品小程序code
 } from "@/api/store.js";
+import {
+	scombinationCode, // 拼团code
+	seckillCode // 秒杀
+} from '@/api/activity.js';
 import i18n from '../utils/lang.js';
 let sysHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
 export const sharePoster = {
@@ -148,14 +152,15 @@ export const sharePoster = {
 		/**
 		 * 生成海报
 		 */
-		async goPoster() {
+		async goPoster(type) {
 			let that = this;
 			that.posters = false;
 			that.$set(that, "canvasStatus", true);
 			let arr2
 			// #ifdef MP
-			getProductCode(that.id)
-				.then((res) => {
+			let met = type === 'scombination' ? scombinationCode(that.id) : type === 'seckill' ? seckillCode(that
+				.id) : getProductCode(that.id)
+			met.then((res) => {
 					uni.downloadFile({
 						url: that.setDomain(res.data.code),
 						success: function(res) {
@@ -182,16 +187,12 @@ export const sharePoster = {
 			// #endif
 			// #ifdef H5 || APP-PLUS
 			arr2 = [that.posterbackgd, that.storeImageBase64, that.PromotionCode];
-			console.log(arr2)
 			if (!that.storeImageBase64)
 				return that.$util.Tips({
 					title: i18n.t(`正在下载海报,请稍后再试`),
 				});
 			that.initPoster(arr2)
 			// #endif
-			console.log(arr2, 'arr2s')
-
-
 		},
 		//替换安全域名
 		setDomain(url) {
@@ -266,4 +267,4 @@ export const sharePoster = {
 			// #endif
 		},
 	}
-};
+};

+ 3 - 3
template/uni-app/pages/activity/goods_combination_details/index.vue

@@ -230,7 +230,7 @@
 				<view class="">{{$t(`微信朋友圈`)}}</view>
 			</view>
 			<!-- #endif -->
-			<button class="item" hover-class='none' @tap="goPoster">
+			<button class="item" hover-class='none' @tap="goPoster('scombination')">
 				<view class="iconfont icon-haibao"></view>
 				<view class="">{{$t(`生成海报`)}}</view>
 			</button>
@@ -418,7 +418,7 @@
 			isLogin: {
 				handler: function(newV, oldV) {
 					if (newV) {
-						this.downloadFilePromotionCode();
+						// this.downloadFilePromotionCode();
 						this.combinationDetail();
 					}
 				},
@@ -647,7 +647,7 @@
 					// #endif
 					// #ifdef MP
 					that.downloadFilestoreImage();
-					that.downloadFilePromotionCode();
+					// that.downloadFilePromotionCode();
 					// #endif
 					// that.setProductSelect();
 					that.DefaultSelect();

+ 2 - 5
template/uni-app/pages/activity/goods_seckill_details/index.vue

@@ -195,7 +195,7 @@
 				<view class="">{{$t(`微信朋友圈`)}}</view>
 			</view>
 			<!-- #endif -->
-			<button class="item" hover-class='none' @tap="goPoster">
+			<button class="item" hover-class='none' @tap="goPoster('seckill')">
 				<view class="iconfont icon-haibao"></view>
 				<view class="">{{$t(`生成海报`)}}</view>
 			</button>
@@ -577,7 +577,7 @@
 					// #endif
 					// #ifndef H5 || APP-PLUS
 					that.downloadFilestoreImage();
-					that.downloadFilePromotionCode();
+					// that.downloadFilePromotionCode();
 					// #endif
 					that.DefaultSelect();
 					setTimeout(() => {
@@ -596,7 +596,6 @@
 					// wxParse.wxParse('description', 'html', that.data.storeInfo.description || '', that, 0);
 					// wxh.time(that.data.time, that);
 				}).catch(err => {
-					console.log(err)
 					that.$util.Tips({
 						title: err
 					})
@@ -1092,11 +1091,9 @@
 			},
 			//滑动轮播图选择商品
 			changeSwitch(e) {
-				console.log(this.skuArr[e])
 				let productSelect = this.skuArr[e];
 				this.$set(this, "selectSku", productSelect);
 				var skuList = productSelect.suk.split(",");
-				console.log(this.attribute.productAttr)
 				this.$set(this.attribute.productAttr[0], "index", skuList[0]);
 				if (skuList.length == 2) {
 					this.$set(this.attribute.productAttr[0], "index", skuList[0]);

+ 0 - 4
template/uni-app/pages/activity/presell_details/index.vue

@@ -630,7 +630,6 @@
 			 *
 			 */
 			ChangeAttr: function(res) {
-				console.log(this.productValue[res])
 				let productSelect = this.productValue[res];
 				this.$set(this, "selectSku", productSelect);
 				if (productSelect && productSelect.stock > 0) {
@@ -1058,7 +1057,6 @@
 			},
 			// 授权关闭
 			authColse: function(e) {
-				console.log(e, 'eeeee');
 				this.isShowAuth = e;
 			},
 			/**
@@ -1311,12 +1309,10 @@
 			},
 			//滑动轮播图选择商品
 			changeSwitch(e) {
-				console.log(this.skuArr, e)
 				let productSelect = this.skuArr[e];
 				this.$set(this, "selectSku", productSelect);
 				var skuList = productSelect.suk.split(",");
 				this.$set(this.attr.productAttr[0], "index", skuList[0]);
-				console.log(this.skuList)
 				if (skuList.length == 2) {
 					this.$set(this.attr.productAttr[0], "index", skuList[0]);
 					this.$set(this.attr.productAttr[1], "index", skuList[1]);

+ 7 - 7
template/uni-app/pages/admin/orderDetail/index.vue

@@ -26,7 +26,7 @@
 				<span class="copy copy-data"
 					:data-clipboard-text="`${orderInfo.real_name} ${orderInfo.user_phone} ${orderInfo.user_address}`">{{$t(`复制`)}}</span>
 				<!-- #endif -->
-				<!-- #ifdef MP -->
+				<!-- #ifndef H5 -->
 				<span class="copy copy-data"
 					@click="copyNum(`${orderInfo.real_name} ${orderInfo.user_phone} ${orderInfo.user_address}`)">{{$t(`复制`)}}</span>
 				<!-- #endif -->
@@ -73,7 +73,7 @@
 					<!-- #ifdef H5 -->
 					<span class="copy copy-data" :data-clipboard-text="orderInfo.order_id">{{$t(`复制`)}}</span>
 					<!-- #endif -->
-					<!-- #ifdef MP -->
+					<!-- #ifndef H5 -->
 					<span class="copy copy-data" @click="copyNum(orderInfo.order_id)">{{$t(`复制`)}}</span>
 					<!-- #endif -->
 				</view>
@@ -150,7 +150,7 @@
 					<!-- #ifdef H5 -->
 					<span class="copy copy-data" :data-clipboard-text="orderInfo.delivery_id">{{$t(`复制`)}}</span>
 					<!-- #endif -->
-					<!-- #ifdef MP -->
+					<!-- #ifndef H5 -->
 					<span class="copy copy-data" @click="copyNum(orderInfo.delivery_id)">{{$t(`复制`)}}</span>
 					<!-- #endif -->
 				</view>
@@ -238,7 +238,6 @@
 			}
 		},
 		onShow() {
-			console.log('111')
 			this.getIndex();
 		},
 		onLoad(option) {
@@ -308,7 +307,6 @@
 				);
 			},
 			agreeExpress(id) {
-				console.log(3333)
 				let that = this;
 				agreeExpress({
 					id
@@ -426,7 +424,7 @@
 					}
 				);
 			},
-			// #ifdef MP
+			// #ifndef H5
 			copyNum(id) {
 
 				uni.setClipboardData({
@@ -667,7 +665,9 @@
 		padding: 25upx 30upx 30upx 30upx;
 	}
 
-	.order-details .address .name {
+	.order-details .address .name {
+		display: flex;
+		align-items: center;
 		font-size: 30upx;
 		color: #282828;
 		margin-bottom: 0.1rem;

+ 0 - 1
template/uni-app/pages/admin/orderList/index.vue

@@ -326,7 +326,6 @@
 				}
 			},
 			agreeExpress(item) {
-				console.log(3333)
 				let that = this;
 				agreeExpress({
 					id: item.id

+ 0 - 1
template/uni-app/pages/admin/statistics/index.vue

@@ -208,7 +208,6 @@
 				let tempDay = []
 				let tempNum = []
 				var that = this;
-				console.log('ffff',that.where);
 				getStatisticsTime(that.where).then(
 					res => {
 						var _info = res.data.chart,

+ 0 - 2
template/uni-app/pages/annex/applicationRecord/index.vue

@@ -66,7 +66,6 @@
 					title: this.$t(`正在加载中`),
 				});
 				getApplicationRecordList(this.pageData).then(res => {
-					console.log(res)
 					this.count = res.data.count
 					this.listData = this.listData.concat(res.data.list)
 					uni.hideLoading();
@@ -75,7 +74,6 @@
 			},
 			// 跳转逻辑
 			jump(item) {
-				console.log(item)
 				if ([0, 2].includes(item.status)) {
 					uni.navigateTo({
 						url: `/pages/store/settled/index?mer_i_id=${item.mer_intention_id}`

+ 0 - 2
template/uni-app/pages/annex/settled/index.vue

@@ -222,7 +222,6 @@
 		},
 		computed: mapGetters(['isLogin']),
 		onLoad(options) {
-			console.log(options)
 			if (this.isLogin) {
 				this.$nextTick(function() {
 					this.getGoodsDetails()
@@ -313,7 +312,6 @@
 			// 获取历史提交数据详情
 			getGoodsDetails() {
 				getGoodsDetails().then(res => {
-					console.log(res)
 					this.status = res.data.status
 					let resData = res.data
 					if (res.data.status !== -1) {

+ 0 - 3
template/uni-app/pages/annex/special/index.vue

@@ -191,7 +191,6 @@
 			};
 		},
 		onLoad(options) {
-			console.log(options)
 			let that = this
 			this.$nextTick(function() {
 				uni.getSystemInfo({
@@ -351,7 +350,6 @@
 			// #endif
 			// 对象转数组
 			objToArr(data) {
-				console.log(data)
 				if (!data) return
 				const keys = Object.keys(data)
 				keys.sort((a, b) => a - b)
@@ -382,7 +380,6 @@
 						title: res.data.title
 					})
 					let temp = []
-					console.log(res.data)
 					let lastArr = that.objToArr(res.data.value)
 					lastArr.forEach((item, index, arr) => {
 						if (item.name == 'pageFoot') {

+ 0 - 1
template/uni-app/pages/extension/customer_list/chat.vue

@@ -240,7 +240,6 @@
 			// #endif
 			// 初始化
 			if (app.globalData.isWsOpen) {
-				console.log('2222')
 				this.$socket.send({
 					data: {
 						token: this.$store.state.app.token,

+ 5 - 0
template/uni-app/pages/goods/goods_return/index.vue

@@ -200,6 +200,9 @@
 			 * 申请退货
 			 */
 			subRefund: function(e) {
+				uni.showLoading({
+					title: this.$t(`申请中`)
+				});
 				let that = this,
 					value = e.detail.value;
 				//收集form表单
@@ -221,6 +224,7 @@
 					uni: that.orderId,
 					cart_ids: this.cartIds
 				}).then(res => {
+					uni.hideLoading();
 					return this.$util.Tips({
 						title: this.$t(`申请成功`),
 						icon: 'success'
@@ -229,6 +233,7 @@
 						url: '/pages/users/user_return_list/index?isT=1'
 					});
 				}).catch(err => {
+					uni.hideLoading();
 					return this.$util.Tips({
 						title: err
 					});

+ 1 - 1
template/uni-app/pages/goods_cate/goods_cate1.vue

@@ -422,7 +422,7 @@
 			justify-content: center;
 			flex-direction: column;
 			position: relative;
-
+			width: 100%;
 			.count-num {
 				position: absolute;
 				display: flex;

+ 0 - 1
template/uni-app/pages/goods_cate/goods_cate2.vue

@@ -595,7 +595,6 @@
 			getAttrs(id) {
 				let that = this;
 				getAttr(id, 0).then(res => {
-					console.log(res.data)
 					uni.hideLoading();
 					that.$set(that.attr, 'productAttr', res.data.productAttr);
 					that.$set(that, 'productValue', res.data.productValue);

+ 0 - 2
template/uni-app/pages/goods_cate/goods_cate3.vue

@@ -163,7 +163,6 @@
 			// }
 		},
 		onLoad() {
-			console.log('aaaa')
 			this.$nextTick(() => {
 				uni.createSelectorQuery().select('#cart').boundingClientRect(res => {
 					const {
@@ -297,7 +296,6 @@
 				let that = this;
 				getCartCounts().then(res => {
 					that.cartCount = res.data.count;
-					console.log(that.$refs.goodClass)
 					that.$refs.goodClass.addIng = false
 				});
 			},

+ 12 - 8
template/uni-app/pages/goods_details/index.vue

@@ -1,8 +1,6 @@
 <template>
 	<view class="product-con" :style="colorStyle">
-
 		<view class="product-con">
-
 			<!-- #ifndef APP-PLUS -->
 			<view class="navbar" :style="{ height: navH + 'rpx', opacity: opacity }">
 				<view class="navbarH" :style="'height:' + navH + 'rpx;'">
@@ -276,7 +274,7 @@
 					</view>
 					<view class="p_center">{{$t(`购物车`)}}</view>
 				</view>
-				<view v-if="a" class="presale">
+				<view v-if="noGoods" class="presale">
 					<view class="acea-row">
 						<form class=" bnts bg-color-hui"><button class=" bnts bg-color-hui"
 								form-type="submit">{{$t(`暂无产品`)}}</button></form>
@@ -510,7 +508,7 @@
 			return {
 				imgHost: HTTP_REQUEST_URL,
 				sysHeight: sysHeight,
-				a: false,
+				noGoods: false,
 				showSkeleton: true, //骨架屏显示隐藏
 				isNodes: 0, //控制什么时候开始抓取元素节点,只要数值改变就重新抓取
 				Active: false,
@@ -829,7 +827,7 @@
 					that.topArr[index]
 				);
 			},
-			scroll(e) {
+			scroll(e) {
 				var that = this,
 					scrollY = e.detail.scrollTop;
 				var opacity = scrollY / 200;
@@ -951,14 +949,14 @@
 					this.$util.Tips({
 						title: this.$t(`重新选择`),
 						success: () => {
-							this.a = true
+							this.noGoods = true
 							this.attr.productSelect.stock = 0
 							this.attr.productSelect.quota = 0
 							this.attr.productSelect.cart_num = 0
 						},
 					});
 				} else {
-					this.a = false
+					this.noGoods = false
 				}
 				this.$set(this, "selectSku", productSelect);
 				if (productSelect && productSelect.stock > 0) {
@@ -1019,8 +1017,13 @@
 			 */
 			getGoodsDetails: function() {
 				let that = this;
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				})
 				getProductDetail(that.id)
 					.then((res) => {
+						uni.hideLoading();
 						let storeInfo = res.data.storeInfo;
 						let good_list = res.data.good_list || [];
 						let count = Math.ceil(good_list.length / 6);
@@ -1131,6 +1134,7 @@
 						that.getCartCount();
 					})
 					.catch((err) => {
+						uni.hideLoading();
 						//状态异常返回上级页面
 						return that.$util.Tips({
 							title: err.toString(),
@@ -1213,7 +1217,7 @@
 					this.$set(productAttr[i], "index", value[i]);
 				}
 				//sort();排序函数:数字-英文-汉字;
-				
+
 				let productSelect = this.productValue[value.join(",")];
 				if (productSelect && productAttr.length) {
 					this.$set(

+ 0 - 1
template/uni-app/pages/index/diy/components/articleList.vue

@@ -61,7 +61,6 @@
 		},
 		created() {},
 		mounted() {
-			console.log('121212',this.conStyle);
 			this.getCidArticle();
 		},
 		methods: {

+ 2 - 7
template/uni-app/pages/index/diy/index.vue

@@ -141,11 +141,10 @@
 				<!-- #endif -->
 				<couponWindow :window="isCouponShow" @onColse="couponClose" :couponImage="couponObj.image"
 					:couponList="couponObj.list"></couponWindow>
-				<view class="uni-p-b-98"></view>
 				<!-- #ifndef MP -->
 				<view v-if="site_config" class="site-config" @click="goICP">{{ site_config }}</view>
 				<!-- #endif -->
-				<!-- <pageFooter v-if="footerStatus"></pageFooter> -->
+				<view class="uni-p-b-98"></view>
 				<view class="foot">
 					<view class="page-footer" id="target" :style="{'background-color':newData.bgColor.color[0].item}">
 						<view class="foot-item" v-for="(item,index) in newData.menuList" :key="index"
@@ -711,7 +710,6 @@
 							this.isHeaderSerch = true
 						}
 						if (item.name == 'pageFoot') {
-							console.log(item.status)
 							if (item.status && item.status.status) {
 								this.newData = item
 							}
@@ -845,7 +843,6 @@
 				});
 			},
 			onsollBotton() {
-				console.log('????', this.isSortType)
 				if (this.isSortType == 0) {
 					// this.getGroomList();
 				} else {
@@ -1188,7 +1185,7 @@
 			justify-content: center;
 			flex-direction: column;
 			position: relative;
-
+			width: 100%;
 			.count-num {
 				position: absolute;
 				display: flex;
@@ -1215,8 +1212,6 @@
 
 		.foot-item .txt {
 			font-size: 24rpx;
-
-
 			&.active {}
 		}
 	}

+ 0 - 2
template/uni-app/pages/index/visualization/index.vue

@@ -428,7 +428,6 @@
 				// #ifndef H5
 				this.domOffsetTop = data.top - 110;
 				// #endif
-				console.log(this.domOffsetTop);
 			},
 			// 优惠券弹窗
 			getCoupon() {
@@ -441,7 +440,6 @@
 						const {
 							data
 						} = res;
-						console.log(res)
 						if (data.list.length) {
 							this.isCouponShow = true;
 							this.couponObj = data;

+ 6 - 7
template/uni-app/pages/order_addcart/order_addcart.vue

@@ -564,7 +564,6 @@
 				}
 			},
 			subOrder(event) {
-				console.log(event)
 				let that = this,
 					selectValue = that.selectValue;
 				if (selectValue.length > 0) {
@@ -700,7 +699,6 @@
 			},
 			blurInput: function(index) {
 				let item = this.cartList.valid[index];
-				console.log(item)
 				if (!item.cart_num) {
 					item.cart_num = 1;
 					this.$set(this.cartList, 'valid', this.cartList.valid)
@@ -749,10 +747,8 @@
 			setCartNum(cartId, cartNum, successCallback) {
 				let that = this;
 				changeCartNum(cartId, cartNum).then(res => {
-					console.log(res)
 					successCallback && successCallback(res.data);
 				}).catch(err => {
-					console.log(err)
 					return that.$util.Tips({
 						title: err
 					});
@@ -996,6 +992,7 @@
 			justify-content: center;
 			flex-direction: column;
 			position: relative;
+			width: 100%;
 
 			.count-num {
 				position: absolute;
@@ -1145,8 +1142,10 @@
 	}
 
 	.shoppingCart .list .item .picTxt .text .reElection .reBnt {
-		width: 120rpx;
-		height: 46rpx;
+		// width: 120rpx;
+		padding: 0 10rpx;
+		// height: 46rpx;
+		margin-top: 6rpx;
 		border-radius: 23rpx;
 		font-size: 26rpx;
 	}
@@ -1166,7 +1165,7 @@
 	.shoppingCart .list .item .picTxt .carnum {
 		height: 47rpx;
 		position: absolute;
-		bottom: 7rpx;
+		bottom: 0rpx;
 		right: 0;
 	}
 

+ 0 - 2
template/uni-app/pages/points_mall/integral_goods_details.vue

@@ -667,11 +667,9 @@
 			},
 			//滑动轮播图选择商品
 			changeSwitch(e) {
-				console.log(this.skuArr[e])
 				let productSelect = this.skuArr[e];
 				this.$set(this, "selectSku", productSelect);
 				var skuList = productSelect.suk.split(",");
-				console.log(this.attribute.productAttr)
 				this.$set(this.attribute.productAttr[0], "index", skuList[0]);
 				if (skuList.length == 2) {
 					this.$set(this.attribute.productAttr[0], "index", skuList[0]);

+ 1 - 2
template/uni-app/pages/user/index.vue

@@ -693,7 +693,6 @@
 							return getCustomer(url)
 
 						} else if (name === '订单核销') {
-							console.log(`${url}`)
 							return uni.navigateTo({
 								url: url
 							});
@@ -1357,7 +1356,7 @@
 			justify-content: center;
 			flex-direction: column;
 			position: relative;
-
+			width: 100%;
 			.count-num {
 				position: absolute;
 				display: flex;

Разница между файлами не показана из-за своего большого размера
+ 539 - 541
template/uni-app/pages/users/components/verify/verifyPoint/verifyPoint.vue


+ 0 - 1
template/uni-app/pages/users/message_center/messageDetail.vue

@@ -41,7 +41,6 @@
 				getMsgDetails(id).then(res => {
 					uni.hideLoading();
 					this.msgData = res.data
-					console.log(res)
 				}).catch(err => {
 					uni.hideLoading();
 					return this.$util.Tips({

+ 0 - 1
template/uni-app/pages/users/payment_on_behalf/index.vue

@@ -197,7 +197,6 @@
 					this.ShareInfo(this.resData)
 					//#endif
 				}).catch((err) => {
-					console.log('1',err)
 					that.$util.Tips({
 						title: err
 					}, {

+ 0 - 1
template/uni-app/pages/users/payment_on_behalf/pay_status.vue

@@ -74,7 +74,6 @@
 		methods: {
 			getDetail() {
 				friendDetail(this.orderId).then(res => {
-					console.log(res)
 					if (this.resData.paid == 0) {
 						return this.$util.Tips({
 							title: this.$t(`该订单暂未支付`)

+ 0 - 3
template/uni-app/pages/users/promoter-order/index.vue

@@ -150,7 +150,6 @@
 				} else {
 					fun = spreadOrder
 				}
-				console.log(fun)
 				fun({
 					page: page,
 					limit: limit
@@ -165,7 +164,6 @@
 							})
 						}
 					}
-					console.log(this.recordList, this.times.length)
 					for (let x = 0; x < this.times.length; x++) {
 						for (let j = 0; j < res.data.list.length; j++) {
 							if (this.times[x] === res.data.list[j].time_key) {
@@ -174,7 +172,6 @@
 							}
 						}
 					}
-					console.log(this.recordList)
 					that.count = res.data.count || 0;
 					that.status = res.data.list.length < 5;
 					that.page += 1;

+ 0 - 1
template/uni-app/pages/users/staff_list/index.vue

@@ -161,7 +161,6 @@
 		methods: {
 			qrR(res) {
 				this.codeSrc = res
-				console.log(res)
 			},
 			showCode() {
 				this.codeModal = true

+ 0 - 1
template/uni-app/pages/users/user_address/index.vue

@@ -271,7 +271,6 @@
 					let region = [res.data.province, res.data.city, res.data.district];
 					that.$set(that, 'userAddress', res.data);
 					that.$set(that, 'region', region);
-					console.log(this.region)
 					that.cityId = res.data.city_id
 				});
 			},

+ 0 - 2
template/uni-app/pages/users/user_address_list/index.vue

@@ -148,7 +148,6 @@
 			 */
 			getWxAddress: function() {
 				let that = this;
-				console.log('111')
 				uni.authorize({
 					scope: 'scope.address',
 					success: function(res) {
@@ -182,7 +181,6 @@
 								});
 							},
 							fail: function(err) {
-								console.log(err)
 								if (err.errMsg == 'chooseAddress:cancel') return that.$util
 									.Tips({
 										title: that.$t(`取消选择`)

+ 0 - 1
template/uni-app/pages/users/user_cash/index.vue

@@ -233,7 +233,6 @@
 					    array.splice(i,1,that.$t(v))
 					})
 					that.$set(that, 'array', array);
-					console.log(array)
 					that.minPrice = res.data.minPrice;
 					that.brokerageType = res.data.brokerageType ? parseInt(res.data.brokerageType) : 0;
 				});

+ 0 - 1
template/uni-app/pages/users/user_distribution_level/index.vue

@@ -195,7 +195,6 @@
 					if (this.levelInfo.rate > 100) {
 						this.levelInfo.rate = 100;
 					}
-					console.log(level_info, level_list)
 					const index = level_list.findIndex((
 							grade, v
 						) =>

+ 0 - 5
template/uni-app/pages/users/user_goods_collection/index.vue

@@ -130,14 +130,11 @@
 				this.checkbox_show = !this.checkbox_show
 			},
 			checkboxChange(e) {
-				console.log(this.ids.length,'ids')
-				console.log(e.detail.value)
 				if (e.detail.value.length < this.ids.length) {
 					this.$set(this, 'isAllSelect', false);
 				} else if (e.detail.value.length === this.collectProductList.length) {
 					this.$set(this, 'isAllSelect', true);
 				}
-				console.log(this.isAllSelect)
 				this.$set(this, 'ids', e.detail.value);
 			},
 			subDel() {
@@ -161,7 +158,6 @@
 
 			},
 			checkboxAllChange(event) {
-				console.log(event.detail.value)
 				let value = event.detail.value;
 				if (value.length > 0) {
 					this.setAllSelectValue(1)
@@ -186,7 +182,6 @@
 						return item;
 					});
 					that.$set(that, 'collectProductList', newValid);
-					console.log(selectValue)
 					that.$set(that, 'ids', selectValue);
 				}
 			},

+ 0 - 1
template/uni-app/pages/users/user_info/index.vue

@@ -225,7 +225,6 @@
 				this.formatSize()
 				// 获取版本号
 				plus.runtime.getProperty(plus.runtime.appid, (inf) => {
-					console.log(inf.version)
 					this.version = inf.version;
 				});
 				// #endif 

+ 0 - 1
template/uni-app/pages/users/user_pwd_edit/index.vue

@@ -132,7 +132,6 @@
 			async success(data) {
 				let that = this;
 				this.$refs.verify.hide()
-				console.log(that.userInfo.phone)
 				await registerVerify({
 					phone: that.userInfo.phone,
 					type: 'reset',

+ 31 - 20
template/uni-app/pages/users/wechat_login/index.vue

@@ -141,8 +141,13 @@
 							that.wechatPhone();
 						}
 					})
-					.catch(error => {
-						// location.replace("/");
+					.catch(err => {
+						uni.hideLoading();
+						uni.showToast({
+							title: err,
+							icon: 'none',
+							duration: 2000
+						});
 					});
 			} else if (code && this.options.scope == 'snsapi_base' && !this.$Cache.has('snsapiKey')) {
 				//公众号静默授权
@@ -223,25 +228,32 @@
 							title: this.$t(`正在登录中`)
 						});
 						authLogin({
-							code,
-							spread_spid: app.globalData.spid,
-							spread_code: app.globalData.code
-						}).then(res => {
-							if (res.data.key !== undefined && res.data.key) {
-								uni.hideLoading();
-								this.authKey = res.data.key;
-								this.isPhoneBox = true;
-							} else {
+								code,
+								spread_spid: app.globalData.spid,
+								spread_code: app.globalData.code
+							}).then(res => {
+								if (res.data.key !== undefined && res.data.key) {
+									uni.hideLoading();
+									this.authKey = res.data.key;
+									this.isPhoneBox = true;
+								} else {
+									uni.hideLoading();
+									let time = res.data.expires_time - this.$Cache.time();
+									this.$store.commit('LOGIN', {
+										token: res.data.token,
+										time: time
+									});
+									this.getUserInfo()
+								}
+							})
+							.catch(err => {
 								uni.hideLoading();
-								let time = res.data.expires_time - this.$Cache.time();
-								this.$store.commit('LOGIN', {
-									token: res.data.token,
-									time: time
+								uni.showToast({
+									title: err,
+									icon: 'none',
+									duration: 2000
 								});
-								this.getUserInfo()
-							}
-
-						})
+							});
 					})
 					.catch(err => {
 						console.log(err)
@@ -459,7 +471,6 @@
 			},
 			// 输入手机号后的回调
 			wechatPhone() {
-				console.log(2222)
 				this.$Cache.clear('snsapiKey');
 				if (this.options.back_url) {
 					let url = uni.getStorageSync('snRouter');

+ 0 - 2
template/uni-app/utils/util.js

@@ -684,7 +684,6 @@ export default {
 					.app.token
 			},
 			success: (res) => {
-				console.log(res)
 				uni.hideLoading();
 				if (res.statusCode == 403) {
 					that.Tips({
@@ -708,7 +707,6 @@ export default {
 				}
 			},
 			fail: (err) => {
-				console.log(err)
 				uni.hideLoading();
 				that.Tips({
 					title: i18n.t(