no message

pages-my/my-ticket.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="my-ticket flex-common-css iPhone-bottom">
+	<view class="my-ticket flex-common-css ">
 		<Nav title="我的优惠券" titleColor="#333" bgckgroundBox='#fff'></Nav>
 		<view class="tab-box flex-justify-around bgc-f ">
 			<view class="tab-but flex-1 flex-direction align-items-center" v-for="(item, index) in tabList" :key="index"
@@ -248,6 +248,7 @@
 	}
 
 	.bot-but {
-		padding: 22rpx 0;
+		padding-top: 22rpx;
+		padding-bottom: env(safe-area-inset-bottom);
 	}
 </style>

pages-my/set-user-phone.vue

@@ -16,11 +16,11 @@
 				<view class="flex-justify-space mb-80">
 					<view class="phone-box mr-24 common-view-css">
 						<image class="icons" src="@/static/img/my/yzm-icons.png" mode=""></image>
-						<input v-model="formData.code" type="number" class="uni-input b-rad-200" focus placeholder="请输入验证码" />
+						<input v-model="formData.code" type="number" class="uni-input b-rad-200" placeholder="请输入验证码" />
 					</view>
 					<view class="get-code-box" @click="getCode()">
 						<view class="get-but fc-57CAFF fs-32 text-align-center b-rad-200">
-							{{codeText}}
+							{{codeNUm == 0?codeText:codeNUm + 's'}}
 						</view>
 					</view>
 				</view>
@@ -47,6 +47,7 @@
 				isAJAX:false,
 				isCode:false,
 				codeText:'获取验证码',
+				codeNUm: 0
 			};
 		},
 		methods:{
@@ -60,10 +61,10 @@
 				this.isCode = true;
 				getCode({phone:this.formData.phone,send_type:'update_phone'}).then((res)=>{
 					if(res.code === 1){
-						this.codeText = 60;
+						this.codeNUm = 60;
 						let timer = setInterval(() => {
-						  this.codeText -= 1;
-						  if (this.codeText <= 0) {
+						  this.codeNUm -= 1;
+						  if (this.codeNUm <= 0) {
 						    clearInterval(timer);
 							this.isCode = false;
 							this.codeText = '获取验证码'

pages-my/user-info.vue

@@ -2,9 +2,9 @@
 	<view class="flex-common-css bgc-f">
 		<Nav title="个人资料" titleColor="#333" bgckgroundBox='#fff'></Nav>
 		<scroll-view :scroll-y="true" class="scroll-view-css">
-			<view class="user-img-box b-rad-50">
+			<view class="user-img-box b-rad-50" @click="goToUrl(0)">
 				<image class="user-img b-rad-50" :src="userInfoData.head_img" mode=""></image>
-				<image @click="goToUrl(0)" class="set-iimg" src="@/static/img/my/pen.png" mode=""></image>
+				<image class="set-iimg" src="@/static/img/my/pen.png" mode=""></image>
 			</view>
 			<view class="item-info-box box-border-box">
 				<view class="item-box mb-32 flex-justify-space box-border-box">

pages-position/Internship-position.vue

@@ -1,9 +1,9 @@
 <template>
-	<view class="flex-common-css iPhone-bottom">
+	<view class="flex-common-css iPhone-bottom box-border-box">
 		<Nav title="实习岗位" leftColor="#fff" bgckgroundBox='transparent' titleColor="#fff"></Nav>
 		<image class="bg" src="@/static/img/index/sxgw.png" mode=""></image>
 		<image class="code-img" :src="codeImg" mode="aspectFit"></image>
-		<image class="but-img" src="@/static/img/index/bcdxc.png" mode=""></image>
+		<image @click="saveImg" class="but-img" src="@/static/img/index/bcdxc.png" mode=""></image>
 	</view>
 </template>
 
@@ -25,7 +25,7 @@
 		methods: {
 			commonPracticeCode() {
 				commonPracticeCode().then((res) => {
-					if(res.code == 1) {
+					if (res.code == 1) {
 						this.codeImg = res.data.url
 					}
 				})
@@ -33,6 +33,39 @@
 			scrolltolower() {
 				console.log('触底');
 			},
+			saveImg() {
+				let that = this
+				//获取授权列表，查看是否授权写入相册权限
+				uni.getSetting({
+					success(res) {
+						if (!res.authSetting['scope.writePhotosAlbum']) {
+							uni.authorize({
+								scope: 'scope.writePhotosAlbum',
+								success() {
+									that.saveimgtoAlbum(that.codeImg)
+								}
+							})
+						} else {
+							that.saveimgtoAlbum(that.codeImg)
+						}
+					}
+				})
+			},
+			saveimgtoAlbum(imgurl) {
+				let that = this
+				uni.chooseImage({
+					count: 1,
+					sourceType: ['camera'],
+					success: function(res) {
+						uni.saveImageToPhotosAlbum({
+							filePath: imgurl,
+							success: function() {
+								tools.success("保存成功")
+							}
+						});
+					}
+				});
+			}
 		},
 	}
 </script>
@@ -50,14 +83,15 @@
 		width: 670rpx;
 		height: 88rpx;
 		position: absolute;
-		bottom: 36rpx;
+		bottom: 56rpx;
 		left: 40rpx;
 	}
-	.code-img{
+
+	.code-img {
 		width: 340rpx;
 		height: 340rpx;
 		position: absolute;
-		top: 488rpx;
+		top: calc(50vh - (340rpx / 2));
 		left: 204rpx;
 		border-radius: 20rpx;
 	}

pages-school/school-circle.vue

@@ -15,7 +15,7 @@
 
 		<view class="ts-box mt-24 align-items-center box-border-box plr-12 mb-20">
 			<image src="@/static/img/school/ts.png" mode=""></image>
-			<view class="fs-26 fw-400 fc-FB3D03">警惕骗钱骗色，保护自身安全，不轻信陌生人</view>
+			<view class="fs-26 fw-400 fc-FB3D03">{{alumni_str}}</view>
 		</view>
 
 		<view class="nav-box display-flex box-border-box mb-20">
@@ -176,7 +176,7 @@
 										{{item.nickname}}
 										<span v-if="item.is_author == 1"
 											class='only-box text-align-center fs-24 fc-41ABF5 ml-10'>作者</span>
-											<span v-if="item.is_self == 1" class="fs-28 fc-6 ml-10">我</span>
+										<span v-if="item.is_self == 1" class="fs-28 fc-6 ml-10">我</span>
 									</view>
 									<view class="fs-30 fw-400 mb-8" @click.stop="openInput(1,item)">
 										{{item.content}}
@@ -209,7 +209,7 @@
 													{{info.nickname}}
 													<span v-if="info.is_author == 1"
 														class='only-box text-align-center fs-24 fc-41ABF5 ml-10'>作者</span>
-														<span v-if="info.is_self == 1" class="fs-28 fc-6 ml-10">我</span>
+													<span v-if="info.is_self == 1" class="fs-28 fc-6 ml-10">我</span>
 												</view>
 												<view class="fs-30 fw-400 mb-8" @click.stop="openInput(2,info)">
 													{{info.content}}
@@ -258,6 +258,9 @@
 		setRemarkLike,
 		delRemark
 	} from '@/api/alumni.js';
+	import {
+		getCommonText
+	} from '@/api/common.js'
 	import {
 		getTopic
 	} from '@/api/category.js';
@@ -311,7 +314,7 @@
 				replyData: {
 					page: 1,
 				},
-
+				alumni_str: '' // 校友圈提示
 			}
 		},
 		onShow() {
@@ -326,8 +329,16 @@
 			this.list = [];
 			this.fromData.page = 1;
 			this.getList();
+			this.getCommonText()
 		},
 		methods: {
+			getCommonText() {
+				getCommonText().then((res) => {
+					if (res.code == 1) {
+						this.alumni_str = res.data.alumni_str
+					}
+				})
+			},
 			toBack() {
 				tools.leftClick()
 			},
@@ -628,7 +639,7 @@
 	}
 </script>
 <style>
-	body{
+	body {
 		background: #fff;
 	}
 </style>

pages-takeout/confirm-order.vue

@@ -78,7 +78,7 @@
 				<view class="text-align-right p-b-20">
 					<span class="fc-9 fs-28">共{{cardData.total_num||0}}件，</span>
 					<span class="fw-400 fc-0 fs-28">合计￥</span>
-					<span class="fw-600 fc-0 fs-44">{{(cardData.total_price - quanMoney) < 0?'0':(cardData.total_price - quanMoney)||0}}</span>
+					<span class="fw-600 fc-0 fs-44">{{((cardData.total_price - quanMoney) < 0?'0':(cardData.total_price - quanMoney)||0).toFixed(2)}}</span>
 				</view>
 			</view>
 			
@@ -117,7 +117,7 @@
 			<view class="flex-justify-space">
 				<view class="align-items-flex-end box-1">
 					<span class="fs-28 fc-f fw-600">￥</span>
-					<span class="fs-44 fc-f fw-600">{{(cardData.total_price - quanMoney) < 0?'0':(cardData.total_price - quanMoney)||0}}</span>
+					<span class="fs-44 fc-f fw-600">{{((cardData.total_price - quanMoney) < 0?'0':(cardData.total_price - quanMoney)||0).toFixed(2)}}</span>
 				</view>
 				<view class="text-align-center box-2 fs-32 fc-f fw-600" @click="toSave()">立即支付</view>
 			</view>

pages-takeout/goods-order.vue

@@ -207,7 +207,7 @@
 				}).then((res) => {
 					if (res.code == 1) {
 						this.delivery_money = res.data.delivery_money
-						this.total_price = Number(this.total_price) + Number(this.delivery_money)
+						this.total_price = (Number(this.total_price) + Number(this.delivery_money)).toFixed(2)
 					}
 				})
 			},
@@ -306,16 +306,26 @@
 											uni.switchTab({
 												url: "/pages/order/index"
 											})
-										}, 1500)
+										}, 1000)
 									},
 									fail: (err) => {
 										this.isAJAX = false;
 										tools.error("支付失败");
+										setTimeout(() => {
+											uni.switchTab({
+												url: "/pages/order/index"
+											})
+										}, 1000)
 									},
 								});
 							} else {
 								this.isAJAX = false;
 								tools.error("支付失败");
+								setTimeout(() => {
+									uni.switchTab({
+										url: "/pages/order/index"
+									})
+								}, 1000)
 							}
 						})
 					} else {

pages-takeout/shop-mod/menu.vue

@@ -540,7 +540,7 @@
 
 			.pop-buttom {
 				width: 100%;
-				height: 250rpx;
+				// height: 250rpx;
 				box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(51, 51, 51, 0.1);
 
 				.pop-buttom-left {
@@ -578,12 +578,13 @@
 			}
 
 			.spec-item {
-				width: 210rpx;
+				min-width: 210rpx;
 				height: 66rpx;
 				line-height: 66rpx;
 				box-sizing: border-box;
 				border-radius: 12rpx;
 				margin: 0 26rpx 26rpx 0;
+				padding: 0 10rpx;
 			}
 
 			.spec-item:nth-child(3) {

pages-takeout/shop.vue

@@ -64,7 +64,7 @@
 			<view class="shop-buttom-money-1 flex-justify-space align-items-center">
 				<image src="@/static/img/takeout/buy-icon.png" mode="scaleToFill"></image>
 				<view class="shop-buttom-num fs-24 fc-f text-align-center">{{cartData.total_num}}</view>
-				<view class="" v-if="cartData.is_place_order===1">
+				<view class="">
 					<view class="">
 						<span class="fw-600 fs-24 fc-f">￥</span>
 						<span class="fw-600 fs-44 fc-f">{{cartData.total_price}}</span>
@@ -72,12 +72,13 @@
 					<view class="fs-24 fc-ADADAD" v-if="delivery_money<=0">免配送</view>
 					<view class="fs-24 fc-f" v-else>配送费￥{{delivery_money}}</view>
 				</view>
-				<view class="fs-32 fw-600 fc-f mr-30" v-else>{{cartData.err_msg}}</view>
-				<view class="shop-buttom-money-2 text-align-center fc-f fs-32 fw-600" @click.stop="toConfirmOrder()">去结算
+				<view v-if="cartData.is_place_order===1" class="shop-buttom-money-2 text-align-center fc-f fs-32 fw-600"
+					@click.stop="toConfirmOrder()">去结算
 				</view>
+				<view v-else class="err-msg fs-32 fw-600 fc-f mr-30">{{cartData.err_msg}}</view>
 			</view>
 		</view>
-		<uni-popup ref="popupBuy" type="bottom">
+		<uni-popup ref="popupBuy" type="bottom" background-color="#fff">
 			<view class="buy-card flex-index-css">
 				<view class="buy-card-top box-border-box plr-32 flex-justify-space align-items-center">
 					<view class="">
@@ -85,11 +86,11 @@
 						<span class="fs-32 fc-9">(打包费<span
 								class="fs-32 fc-FB3D03">{{cartData.pack_price}}元</span>)</span>
 					</view>
-					<view class="fs-28 fw-400 fc-9 align-items-center">
+					<view class="fs-28 fw-400 fc-9 align-items-center" @click.stop="setShopIngDel">
 						<view class="">
 							<uni-icons type="trash" size="18" color="#999"></uni-icons>
 						</view>
-						<view class="fs-28 fw-400 fc-9" @click.stop="setShopIngDel">清空</view>
+						<view class="fs-28 fw-400 fc-9">清空</view>
 					</view>
 				</view>
 				<view class="scroll-view-css box-border-box p-32">
@@ -124,7 +125,7 @@
 					<view class="shop-buttom-money-1 flex-justify-space align-items-center">
 						<image src="@/static/img/takeout/buy-icon.png" mode="scaleToFill"></image>
 						<view class="shop-buttom-num fs-24 fc-f text-align-center">{{cartData.total_num}}</view>
-						<view class="" v-if="cartData.is_place_order===1">
+						<view class="">
 							<view class="">
 								<span class="fw-600 fs-24 fc-f">￥</span>
 								<span class="fw-600 fs-44 fc-f">{{cartData.total_price}}</span>
@@ -132,9 +133,11 @@
 							<view class="fs-24 fc-ADADAD" v-if="delivery_money<=0">免配送</view>
 							<view class="fs-24 fc-f" v-else>配送费￥{{delivery_money}}</view>
 						</view>
-						<view class="fs-32 fw-600 fc-f mr-30" v-else>{{cartData.err_msg}}</view>
-						<view class="shop-buttom-money-2 text-align-center fs-32 fc-f fw-600">
+						<view v-if="cartData.is_place_order===1"
+							class="shop-buttom-money-2 text-align-center fs-32 fc-f fw-600"
+							@click.stop="toConfirmOrder()">
 							去结算</view>
+						<view class="fs-32 fw-600 fc-f mr-30" v-else>{{cartData.err_msg}}</view>
 					</view>
 				</view>
 			</view>
@@ -309,10 +312,10 @@
 					if (res.code === 1) {
 						this.cartData = res.data
 						if (this.shopType === 1) {
-              setTimeout(()=>{
-                console.log('我的数据执行了')
-                this.$refs.goodsMenu.setShopIngList(this.cartData)
-              },1000)
+							setTimeout(() => {
+								console.log('我的数据执行了')
+								this.$refs.goodsMenu.setShopIngList(this.cartData)
+							}, 1000)
 
 						}
 					}

pages/order/index.vue

@@ -316,7 +316,7 @@
 			orderPay(item) {
 				// 立即支付
 				if (this.type === 1) {
-					this.orderPay(item.id)
+					this.takeawayPay(item.id)
 				} else if (this.type === 2) {
 					this.getExpressPay(item.id)
 				} else if (this.type === 3) {
@@ -547,7 +547,7 @@
 					}
 				})
 			},
-			orderPay(id) {
+			takeawayPay(id) {
 				// 外卖支付
 				orderPay({
 					order_id: id