1.9 开始读文档

components/order/OrderItem.vue

@@ -39,20 +39,20 @@
         <text v-show="order.status === 'shipping'">全力奔跑中，请耐心等待哦！</text>
         <text v-show="order.status === 'delivered'">您的餐点已送到取餐点，请尽快取餐</text>
       </view>
-      <view class="action-btn cancel" v-show="order.status === 'pending'" @click="cancelOrder">
+      <view class="action-btn cancel" v-show="order.status === 'pending'" @click.stop="cancelOrder">
         取消订单
       </view>
-      <view class="action-btn confirm" v-show="order.status === 'pending'" @click="payOrder">
+      <view class="action-btn confirm" v-show="order.status === 'pending'" @click.stop="payOrder">
         立即下单
       </view>
       <view class="action-btn confirm" v-show="order.status === 'processing' || order.status === 'shipping'"
-        @click="payOrder">
+        @click.stop="clickOrder">
         查看订单
       </view>
-      <view class="action-btn confirm" v-show="order.status === 'completed'" @click="gotoSale">
+      <view class="action-btn confirm" v-show="order.status === 'completed'" @click.stop="gotoSale">
         订单售后
       </view>
-      <view class="action-btn confirm" v-show="order.status === 'delivered'" @click="payOrder">
+      <view class="action-btn confirm" v-show="order.status === 'delivered'" @click.stop="pickOrder">
         取餐完成
       </view>
     </view>
@@ -101,6 +101,10 @@ export default {
       this.$utils.navigateTo({
         url: '/pages_order/order/afterSale?id=' + this.order.id
       })
+    },
+    // 取餐完成
+    pickOrder() {
+      this.$emit('pick', this.order)
     }
   }
 }

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "unapp模板",
-    "appid" : "__UNI__197A38F",
+    "appid" : "__UNI__098D831",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -57,7 +57,11 @@
             "urlCheck" : false
         },
         "usingComponents" : true,
-        "permission" : {},
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "你的位置信息将用于小程序位置接口的效果展示" // 高速公路行驶持续后台定位
+            }
+        },
         "requiredPrivateInfos" : [ "chooseLocation" ],
         "unipush" : {
             "enable" : true

pages.json

@@ -42,7 +42,8 @@
 	},
 	"subPackages": [{
 		"root": "pages_order",
-		"pages": [{
+		"pages": [
+			{
 				"path": "mine/partner"
 			},
 			{

pages/index/cart.vue

@@ -286,8 +286,7 @@ export default {
     }
 	.cart-footer {
 		position: fixed;
-		bottom: 120rpx;
-		// bottom: calc(120rpx + env(safe-area-inset-bottom));
+		bottom: calc(120rpx + env(safe-area-inset-bottom));
 		left: 0;
 		width: 100%;
 		height: 100rpx;
@@ -317,7 +316,7 @@ export default {
 			margin-right: 20rpx;
 			// background-color: red;
 			.total-price {
-				color: #ff0000;
+				color: $uni-color-second;
 				font-size: 32rpx;
 				font-weight: bold;
 				margin-left: 10rpx;
@@ -334,7 +333,7 @@ export default {
 			font-size: 28rpx;
 		}
 		.checkbox-primary{
-			background-color: #019245;
+			background-color: $uni-color;
 			color: #fff;
 		}
 		.checkbox-collect{
@@ -345,7 +344,7 @@ export default {
 	.control-text{
 		position: absolute;
 		right: 150rpx;
-		top: 60rpx;
+		top: calc(env(safe-area-inset-bottom) + 60rpx);
 		font-size: 26rpx;
 		color: #fff;
 		z-index: 10000;

pages/index/category.vue

@@ -5,11 +5,11 @@
 
 		<!-- 搜索栏 -->
 		<view class="search">
-			<image src="/static/image/logo.png" mode="aspectFill" class="search-img"></image>
+			<image src="/static/image/logo.png" mode="aspectFill" class="search-img" @tap="testUtiles" />
 			<view style="position: relative;">
 				<uv-search placeholder="陕西苹果" bgColor="#fff" @search="search" @change="search" @custom="search"
 					:searchIconSize="40" v-model="queryParams.title" height="75rpx" :showAction="false"
-					actionText=" "></uv-search>
+					actionText=" " />
 				<text class="search-text" @tap="search">搜索</text>
 			</view>
 		</view>
@@ -114,6 +114,7 @@ export default {
 		change(e) {
 			// this.queryParams.classId = this.category[e].id
 			this.currentChildren = e
+			
 		},
 		clickTabs({ index }) {
 			this.current = index
@@ -132,6 +133,14 @@ export default {
 		// 		url: `/pages_order/product/productDetail?id=${id}`
 		// 	})
 			this.$utils.navigateTo(`/pages_order/product/productDetail?id=${id}`);
+		},
+		testUtiles() {
+			try{
+				this.$authorize('scope.userLocation')
+			}catch(error){
+				console.log(error);
+			}
+			
 		}
 	}
 }

pages/index/order.vue

@@ -4,17 +4,17 @@
 		<navbar title=" " bgColor="#019245" color="#fff" />
 
 		<!-- 搜索框 -->
-		<view class="search-box" style="background-color: #fff; padding: 12rpx 20rpx 0rpx; ">
+		<view style="background-color: #fff; padding: 12rpx 20rpx 0rpx; ">
 			<uv-search placeholder="搜索商品名" v-model="keyword" :showAction="false" actionText="" height="80rpx" animation
-				bgColor="#F5F5F5" inputAlign="center" color="#000" placeholderColor="#979797"
-				searchIconSize="50rpx"></uv-search>
+			bgColor="#F5F5F5" inputAlign="center" color="#000" placeholderColor="#979797"
+			searchIconSize="50rpx"></uv-search>
 		</view>
-
+		
 		<!-- 订单筛选 -->
 		<view class="tabs">
 			<uv-tabs :list="tabs" :activeStyle="{ color: '#019245'}" lineColor="#019245" :scrollable="false"
-				:inactiveStyle="{color: 'black'}" lineHeight="6rpx" lineWidth="55rpx" :current="current"
-				@tap="clickTabs" />
+			:inactiveStyle="{color: 'black'}" lineHeight="6rpx" lineWidth="55rpx" :current="current"
+			@click="clickTabs" />
 		</view>
 
 		<!-- 团餐列表 -->
@@ -31,7 +31,8 @@
 		<!-- 订单列表 -->
 		<view class="order-list" v-else>
 			<OrderItem v-for="(order, index) in orderList" :key="order.id" :order="order" @cancel="handleCancelOrder"
-				@pay="handlePayOrder" @tap="goToOrderDetail(order)" />
+			@pick="handlePickOrder"
+				@pay="handlePayOrder" @click="goToOrderDetail" />
 			<view style="margin-top: 200rpx; min-width: 700rpx;">
 				<uv-empty mode="order" v-if="orderList.length == 0"></uv-empty>
 			</view>
@@ -191,6 +192,7 @@
 				}
 				// 关闭请求
 				// this.getData()
+				console.log('点击了tab栏', index);
 				
 				// 模拟根据状态筛选订单
 				this.filterOrdersByStatus(index)
@@ -234,6 +236,7 @@
 				uni.showModal({
 					title: '提示',
 					content: '确定要取消订单吗？',
+					confirmColor: '#019245',
 					success: (res) => {
 						if (res.confirm) {
 							// 模拟取消订单API调用
@@ -283,6 +286,27 @@
 						}
 					}
 				}, 1500)
+			},
+			// 处理取餐完成
+			handlePickOrder(order) {
+				uni.showModal( {
+					title: '提示',
+					content: '确定取餐完成？',
+					confirmColor: '#019245',
+					success: (res) => {
+						if (res.confirm) {
+							order.status = 'completed',
+							this.clickTabs({
+								index: 3
+							})
+							uni.showToast({
+								title: '取餐完成',
+								icon: 'success',
+								duration: 2000
+							})
+						}
+					}
+				})
 			}
 		}
 	}

pages_order/mine/share.vue

@@ -72,40 +72,12 @@ export default {
         // 保存到本地
         saveToLocal() {
             // 微信小程序保存图片需要用户授权
-            uni.getSetting({
-                success: (res) => {
-                    if (!res.authSetting['scope.writePhotosAlbum']) {
-                        uni.authorize({
-                            scope: 'scope.writePhotosAlbum', // 判断的是相册权限
-                            success: () => {
-                                this.saveImage()
-                            },
-                            fail: () => {
-                                // 授权失败
-                                uni.showModal({
-                                    title: '提示',
-                                    content: '需要您授权保存图片',
-                                    confirmText: '去设置',
-                                    confirmColor: '#019245',
-                                    success: (res) => {
-                                        if (res.confirm) {
-                                            uni.openSetting()
-                                        }
-                                    },
-                                    fail: () => {
-                                        uni.showToast({
-                                            title: '授权失败',
-                                            icon: 'none'
-                                        })
-                                    }
-                                })
-                            }
-                        })
-                    } else {
-                        this.saveImage()
-                    }
-                }
-            })
+            try{
+                this.$authorize('scope.writePhotosAlbum')
+                this.saveImage()
+            } catch (error) {
+                
+            }
         },
 
         // 保存图片的具体实现

pages_order/mine/updateUser.vue

@@ -14,7 +14,8 @@
 			<!-- 头像选择区域 -->
 			<view class="avatar-section">
 				<button class="chooseAvatar" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
-					<image class="avatar-img" :src="form.headImage" mode="aspectFill"></image>
+					<image class="avatar-img" :src="form.headImage" mode="aspectFill" />
+					<!-- <image class="avatar-img" src="https://img.yzcdn.cn/vant/ipad.png" mode="aspectFill"></image> -->
 				</button>
 				<text class="avatar-hint">点击更换头像</text>
 			</view>

store/store.js

@@ -29,6 +29,8 @@ const store = new Vuex.Store({
 						configList[n.keyName] = n.keyContent;
 						configList[n.keyName + '_keyValue'] = n.keyValue;
 					});
+					console.log(configList);
+					
 				}
 				state.configList = configList
 				uni.$emit('initConfig', state.configList)
@@ -57,6 +59,7 @@ const store = new Vuex.Store({
 						code: res.code,
 					}
 
+					// 如果通过分享者链接进入小程序时，会将分享者ID存储在本地
 					if (uni.getStorageSync('shareId')) {
 						data.shareId = uni.getStorageSync('shareId')
 					}

utils/authorize.js

@@ -9,6 +9,7 @@ function authorize(scope){
 			success,
 			complete(res) {
 				/* 判断如果没有授权就打开设置选项让用户重新授权 */
+				// 获取授权信息						
 				uni.getSetting({
 					success(res) {
 						if (!res.authSetting[scope]) {
@@ -24,10 +25,12 @@ function authorize(scope){
 				title: '当前操作未授权，请授权！',
 				content: '拒绝授权将影响本小程序部分功能的使用',
 				confirmText: '授权',
+				confirmColor: '#019245',
 				success(e) {
 					if(!e.confirm){
 						return error()
 					}
+					// 打开小程序设置页 手动设置
 					uni.openSetting({
 						success(res) {
 							if (!res.authSetting[scope]) {

utils/index.js

@@ -1,4 +1,3 @@
-
 import Vue from 'vue'
 
 import util from './utils.js'

utils/pay.js

@@ -2,7 +2,7 @@
 // #ifdef H5
 import jWeixin from './lib/jweixin-module.js'
 // #endif
-
+// 这部分是H5端的微信支付！！！！！！
 /**
  * 调用微信支付
  * @param {Object} res - 支付参数对象，包含appId、timeStamp、nonceStr等必要信息