Merge branch 'master' of ssh://gogs.zfire.top:2222/zfire-front/recycle-mobile

* 'master' of ssh://gogs.zfire.top:2222/zfire-front/recycle-mobile:
  feat: 添加消息列表页面
  no message
  no message
  no message
  no message
  no message
  no message
  no message
  no message
  no message

.env.production

@@ -8,4 +8,4 @@ VUE_APP_BASE_URL = 'https://knowledge.gd-jxm.com'
 VUE_APP_BASE_API = '/api'
 
 # PATH
-VUE_APP_BASE_PATH = '/mobile-ter/'
+VUE_APP_BASE_PATH = '/recycleh5/'

src/App.vue

@@ -1,9 +1,54 @@
-<script>
-	import Vue from 'vue';
+<script>
+	import Vue from 'vue';
+// 判断微信环境
+function isWeixin() {
+  var ua = navigator.userAgent.toLowerCase();
+  if (ua.indexOf('micromessenger') != -1) {
+    return true;
+  } else {
+    return false;
+  }
+}
 
+// 解析地址栏参数
+function getQueryVariable(variable) {
+  // 从?开始获取后面的所有数据
+  var query = window.location.search.substring(1);
+  // 从字符串&开始分隔成数组split
+  var vars = query.split('&');
+  // 遍历该数组
+  for (var i = 0; i < vars.length; i++) {
+    // 从等号部分分割成字符
+    var pair = vars[i].split('=');
+    // 如果第一个元素等于 传进来的参的话 就输出第二个元素
+    if (pair[0] == variable) {
+      return pair[1];
+    }
+  }
+  return undefined;
+}
   export default {
     onLaunch: function() {
-      // console.log('App Launch')
+      if(isWeixin()){
+        // 微信鉴权登入
+        var isAuthorization = getQueryVariable('isAuthorization');
+        if (isAuthorization) {
+          var url = 'https://jiasm.zfire.top/recycleh5/pages/login/indexs';
+          const href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxaddd13c267e81e70&redirect_uri=${url}&response_type=code&scope=snsapi_userinfo#wechat_redirect`;
+          window.location.href = href;
+        } else {
+          var code = getQueryVariable('code');
+          if (code) {
+            alert(code)
+            uni.setStorageSync('code', code);
+          } else if (!uni.getStorageSync('code')) {
+            alert("重定向")
+            const url = location.href;
+            const href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxaddd13c267e81e70&redirect_uri=${url}&response_type=code&scope=snsapi_userinfo#wechat_redirect`;
+            window.location.href = href;
+          }
+        }
+      }
     },
     onShow: function() {
       // console.log('App Show')
@@ -16,7 +61,7 @@
 
 <style lang="scss">
   /*每个页面公共css */
-  @import "uview-ui/index.scss";
-
+  @import "uview-ui/index.scss";
+
   @import "styles/iconfont.css";
-</style>
+</style>

src/common/utils/common.js

@@ -1,32 +1,32 @@
 // 不含icon提示框
 export const toast = str => {
-	return new Promise((resolve, reject) => {
-		if(str.length < 20) {
-			uni.showToast({
-				title: str,
-				icon: "none",
-				duration: 1500,
-				success: () => {
-					setTimeout(() => {
-						resolve
-					}, 1500)
-				}
-			})
+	return new Promise((resolve, reject) => {
+		if(str.length < 20) {
+			uni.showToast({
+				title: str,
+				icon: "none",
+				duration: 1500,
+				success: () => {
+					setTimeout(() => {
+						resolve
+					}, 1500)
+				}
+			})
 		}
-		else {
-			uni.showModal({
-				title: "提示",
-				content: String(str),
-				showCancel: false,
-				confirmText: "我知道了",
-				success(res) {
-					if (res.confirm) {
-						resolve(res);
-					} else {
-						reject();
-					}
-				}
-			});
+		else {
+			uni.showModal({
+				title: "提示",
+				content: String(str),
+				showCancel: false,
+				confirmText: "我知道了",
+				success(res) {
+					if (res.confirm) {
+						resolve(res);
+					} else {
+						reject();
+					}
+				}
+			});
 		}
 	})
 };
@@ -113,8 +113,8 @@ export const modal = (options = {}) => {
 			},
 		});
 	});
-};
-
+};
+
 /**
  * 跳转页面 navigateTo
  * 保留当前页面，跳转到应用内的某个页面
@@ -206,9 +206,19 @@ export const copy = (val) => {
 			successToast('复制成功');
 		},
 	});
-};
-
-
+};
+
+// 判断微信环境
+export function isWeixin() {
+	var ua = navigator.userAgent.toLowerCase();
+	if (ua.indexOf('micromessenger') != -1) {
+		return true;
+	} else {
+		return false;
+	}
+}
+
+
 export default {
 	toast,
 	successToast,
@@ -221,4 +231,4 @@ export default {
 	backPage,
 	callPhone,
 	copy
-};
+};

src/manifest.json

@@ -1,137 +1,136 @@
-{
-  "name": "recycle",
-  "appid": "",
-  "description": "",
-  "versionName": "1.0.0",
-  "versionCode": "100",
-  "transformPx": false,
-  "networkTimeout": {
-    "request": 30000,
-    "connectSocket": 10000,
-    "uploadFile": 100000,
-    "downloadFile": 10000
-  },
-  "h5": {
-    "title": "",
-    "publicPath": "/",
-    "devServer": {
-      "https": false,
-      "port": 3000,
-      "open": true,
-      "proxy": {
-        "/api": {
-          "target": "http://127.0.0.1:3001",
-          "changeOrigin": true,
-          "secure": false,
-          "pathRewrite": {
-            "^/api": ""
-          }
-        }
-      }
-    },
-    "router": {
-      "mode": "hash",
-      "base": "/"
-    },
-    "optimization": {
-      "prefetch": true,
-      "preload": true,
-      "treeShaking": {
-        "enable": true
-      }
-    },
-    "sdkConfigs": {
-      // 使用地图或位置相关功能必须填写其一
-    }
-  },
-  "mp-weixin": {
-    /* 微信小程序特有相关 */
-    "appid": "",
-    "setting": {
-      "urlCheck": false,
-      "es6": true,
-      "postcss": true,
-      "minified": true,
-      "preloadBackgroundData": false,
-      "newFeature": true,
-      "coverView": true,
-      "autoAudits": false,
-      "showShadowRootInWxmlPanel": true,
-      "scopeDataCheck": false,
-      "uglifyFileName": true,
-      "checkInvalidKey": true,
-      "checkSiteMap": true,
-      "uploadWithSourceMap": true,
-      "bigPackageSizeSupport": false /* 预览及真机调试时包体积上限是否调整为4M*/
-    },
-    "usingComponents": true,
-    "optimization": {
-      "subPackages": true
-    },
-    "permission": {
-      "scope.userLocation": {
-        "desc": "你的位置信息将用于小程序位置接口的效果展示"
-      }
-    }
-  },
-  "app-plus": {
-    /* 5+App特有相关 */
-    "usingComponents": false,
-    "splashscreen": {
-      "alwaysShowBeforeRender": false,
-      "waiting": true,
-      "autoclose": true,
-      "delay": 0
-    },
-    "modules": {
-      /* 模块配置 */ },
-    "distribute": {
-      /* 应用发布信息 */
-      "android": {
-        /* android打包配置 */
-        "permissions": [
-          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-          "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
-          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-          "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-          "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
-          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-          "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-          "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-          "<uses-feature android:name=\"android.hardware.camera\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-        ]
-      },
-      "ios": {
-        /* ios打包配置 */ },
-      "sdkConfigs": {
-        /* SDK配置 */ }
-    }
-  },
-  "quickapp": {
-    /* 快应用特有相关 */ },
-  "mp-alipay": {
-    "usingComponents": true
-  },
-  "mp-baidu": {
-    "usingComponents": false
-  },
-  "mp-toutiao": {
-    "usingComponents": true
-  },
-  "mp-qq": {
-    "usingComponents": true
-  }
+{
+    "name" : "recycle",
+    "appid" : "__UNI__ED0779D",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    "networkTimeout" : {
+        "request" : 30000,
+        "connectSocket" : 10000,
+        "uploadFile" : 100000,
+        "downloadFile" : 10000
+    },
+    "h5" : {
+        "title" : "",
+        "publicPath" : "/",
+        "devServer" : {
+            "https" : false,
+            "port" : 3000,
+            "open" : true,
+            "proxy" : {
+                "/api" : {
+                    "target" : "http://127.0.0.1:3001",
+                    "changeOrigin" : true,
+                    "secure" : false,
+                    "pathRewrite" : {
+                        "^/api" : ""
+                    }
+                }
+            }
+        },
+        "router" : {
+            "mode" : "history",
+            "base" : "/"
+        },
+        "optimization" : {
+            "prefetch" : true,
+            "preload" : true,
+            "treeShaking" : {
+                "enable" : true
+            }
+        },
+        "sdkConfigs" : {}
+    },
+    // 使用地图或位置相关功能必须填写其一
+    "mp-weixin" : {
+        /* 微信小程序特有相关 */
+        "appid" : "wxd935838591c00e16",
+        "setting" : {
+            "urlCheck" : false,
+            "es6" : true,
+            "postcss" : true,
+            "minified" : true,
+            "preloadBackgroundData" : false,
+            "newFeature" : true,
+            "coverView" : true,
+            "autoAudits" : false,
+            "showShadowRootInWxmlPanel" : true,
+            "scopeDataCheck" : false,
+            "uglifyFileName" : true,
+            "checkInvalidKey" : true,
+            "checkSiteMap" : true,
+            "uploadWithSourceMap" : true,
+            "bigPackageSizeSupport" : false /* 预览及真机调试时包体积上限是否调整为4M*/
+        },
+        "usingComponents" : true,
+        "optimization" : {
+            "subPackages" : true
+        },
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "你的位置信息将用于小程序位置接口的效果展示"
+            }
+        }
+    },
+    "app-plus" : {
+        /* 5+App特有相关 */
+        "usingComponents" : false,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : false,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        "modules" : {},
+        /* 模块配置 */
+        "distribute" : {
+            /* 应用发布信息 */
+            "android" : {
+                /* android打包配置 */
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            "ios" : {},
+            /* ios打包配置 */
+            "sdkConfigs" : {}
+        }
+    },
+    /* SDK配置 */
+    "quickapp" : {},
+    /* 快应用特有相关 */
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : false
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "mp-qq" : {
+        "usingComponents" : true
+    }
 }

src/mixins/index.js

@@ -1,3 +1,7 @@
+import {
+  isWeixin
+} from '@/common/utils/common';
+
 // 存放页面公用数据、方法...
 export default {
   data() {
@@ -9,6 +13,14 @@ export default {
   onLoad() {
 
   },
+  onShow() {
+    if(isWeixin()){
+      var uni_page_head = document.querySelector("uni-page-head[uni-page-head-type='default']")
+      if(uni_page_head){
+        uni_page_head.remove()
+      }
+    }
+  },
   methods: {
     //检查文件类型
     $checkFileType(url) {

src/pages/message/index.vue

@@ -1,6 +1,31 @@
 <template>
-    <view>
+    <view class="message_user">
+        <view class="gonggao">
+            <view>防骗手册，为您保驾护航</view>
+            <text class="iconfont icon-jinru"></text>
+        </view>
+        <view class="message_user_aview" v-for="(item,index) in 5" :key="index">
+            <view class="message_user_a">
+                <view class="message_user_info">
+                    <!-- 头像 -->
+                    <view class="user_head">
 
+                    </view>
+                    <view  class="user_info">
+                        <!-- 姓名 -->
+                        <view class="user_name">张锋</view>
+                        <!-- 聊天信息最后一条 -->
+                        <view class="user_goods">商品很nice</view>
+                        <!-- 聊天信息最后一条的时间 -->
+                        <view class="user_time">2023-10-21 12：20：21</view>
+                    </view>
+                    <!-- 商品图片 -->
+                    <view  class="goods_img">
+
+                    </view>
+                </view>
+            </view>
+        </view>
     </view>
 </template>
 
@@ -11,5 +36,92 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.message_user{
+    width: 100%;
+    box-sizing: border-box;
+    padding-top: 80rpx;
+    .gonggao{
+        position: absolute;
+        width: 100%;
+        height: 80rpx;
+        background: #fff2d4;
+        top: 0;
+        z-index: 999;
+        left: 0;
+        right: 0;
+        box-sizing: border-box;
+        padding: 0 20rpx;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        font-size: 24rpx;
+        color: rgb(230, 138, 19);
+        view{
+            color: rgb(230, 138, 19);
+        }
+    }
+    .message_user_aview{
+        width:100%;
+        height: auto;
+        box-sizing: border-box;
+        padding: 0 20rpx;
+        background: #fff;
+        .message_user_a{
+            width: 100%;
+            height: auto;
+            box-sizing: border-box;
+            padding: 20rpx 0;
+        }
 
+        &:not(:last-child){
+            .message_user_a{
+                border-bottom: 1rpx solid #ddd;
+            }
+        }
+        .message_user_info{
+            width: 100%;
+            display: flex;
+            justify-content: space-between;
+            align-items: flex-start;
+            .user_head{
+                width: 80rpx;
+                height: 80rpx;
+            }
+            .user_info{
+                width: 500rpx;
+                min-height: 100rpx;
+                box-sizing: border-box;
+                padding: 0 16rpx;
+                .user_name{
+                    width: 100%;
+                    font-size: 28rpx;
+                    font-weight: bold;
+                    overflow: hidden; /*超出部分隐藏*/
+                    white-space: nowrap; /*禁止换行*/
+                    text-overflow: ellipsis; /*省略号*/
+                }
+                .user_goods{
+                    width: 100%;
+                    font-size: 24rpx;
+                    overflow: hidden; /*超出部分隐藏*/
+                    white-space: nowrap; /*禁止换行*/
+                    text-overflow: ellipsis; /*省略号*/
+                    margin: 10rpx 0;
+                }
+                .user_time{
+                    width: 100%;
+                    font-size: 20rpx;
+                    color: #aaa;
+                    overflow: hidden; /*超出部分隐藏*/
+                    white-space: nowrap; /*禁止换行*/
+                    text-overflow: ellipsis; /*省略号*/
+                }
+            }
+            .goods_img{
+                width: 100rpx;
+                height: 100rpx;
+            }
+        }
+    }
+}
 </style>

src/static/MP_verify_TFjhBEfI1TmAGoW8.txt

@@ -0,0 +1 @@
+TFjhBEfI1TmAGoW8