Merge branch 'master' of http://git.lcpcp.cc/root/uni-app

api/common.js

@@ -1,4 +1,4 @@
-import {request} from './ajax.js'
+import {request} from '../service/ajax.js'
 
 const commonUrl = '/api/common/'
 // 发送短信

api/goods.js

@@ -1,4 +1,4 @@
-import { request } from './ajax.js'
+import { request } from '../service/ajax.js'
 // 商品模块路由
 const goodsUrl = '/api/goods/'
 // 猜你喜欢

api/login.js

@@ -1,4 +1,4 @@
-import {request} from './ajax.js'
+import {request} from '../service/ajax.js'
 
 const newsUrl = '/api/user/'
 // 登陆

common/font/iconfont.css

@@ -1,6 +1,6 @@
 @font-face {
   font-family: "iconfont";
-  src: url('@/static/iconfont.ttf') format('truetype')
+  src: url('@/static/font/iconfont.ttf') format('truetype')
 }
 
 .iconfont {
@@ -10,4 +10,4 @@
 
 .icon-dangdi:before {
   content: "\e6d7";
-}
+}

common/js/utils.js

@@ -1,95 +0,0 @@
-export const toInteger = function (num) {
-    // 取整
-    let toNum = "";
-    toNum = parseInt(num);
-    return toNum;
-}
-export const twoFloating = function (num) {
-    // 获取两位小数
-    let price = "";
-    price = num * 1;
-    price = String(price).split(".")[1];
-    if (price !== undefined && price.length === 1) {
-        price = `.${price}0`;
-    } else {
-        price === undefined ? (price = ".00") : (price = `.${price}`);
-    }
-    return price;
-}
-
-
-/**
- * 获取开发平台
- * @returns {string}
- */
-export const getPlatform = function () {
-    let platForm = undefined;
-    // #ifdef H5
-    platForm = 'H5';
-    //#endif
-    // #ifdef APP-PLUS
-    platForm = 'APP';
-    //#endif
-    // #ifdef APP-PLUS-NVUE
-    platForm = 'APP';
-    //#endif
-    // #ifdef APP-NVUE
-    platForm = 'APP';
-    //#endif
-    // #ifdef MP-WEIXIN
-    platForm = 'MP-WEIXIN';
-    //#endif
-    // #ifdef MP-ALIPAY
-    platForm = 'MP-ALIPAY';
-    //#endif
-    // #ifdef MP-BAIDU
-    platForm = 'MP-BAIDU';
-    //#endif
-    // #ifdef MP-TOUTIAO
-    platForm = 'MP-TOUTIAO';
-    //#endif
-    // #ifdef MP-LARK
-    platForm = 'MP-LARK';
-    //#endif
-    // #ifdef MP-QQ
-    platForm = 'MP-QQ';
-    //#endif
-    // #ifdef MP-KUAISHOU
-    platForm = 'MP-KUAISHOU';
-    //#endif
-    // #ifdef QUICKAPP-WEBVIEW
-    platForm = 'QUICKAPP-WEBVIEW';
-    //#endif
-    return platForm;
-
-}
-
-/**
- * 获取小程序胶囊居中对齐的高度
- */
-export const getNavHeight = function () {
-    let platForm = getPlatform();
-    if (platForm === 'MP-WEIXIN') {
-        let res = uni.getSystemInfoSync();
-        let menuButtonInfo = uni.getMenuButtonBoundingClientRect();
-        let navHeight =
-            menuButtonInfo.height + (menuButtonInfo.top - res.statusBarHeight) * 2;
-        return navHeight
-    } else {
-        return 44;
-    }
-}
-
-/**
- * 手机顶部高度
- */
-export const getPhoneTopHeight = function () {
-    let platForm = getPlatform();
-    if (platForm === 'MP-WEIXIN') {
-        let height = uni.getSystemInfoSync().statusBarHeight;
-        return height
-    } else {
-        return 0;
-    }
-
-}

components/en-from/en-head/en-head-img.vue

@@ -18,8 +18,8 @@
 </template>
 
 <script>
-	import { upLoadingFileOss } from "@/common/js/upLoadingFile";
-	import tools from '@/common/js/tools.js'
+	import { upLoadingFileOss } from "@/service/upLoadingFile";
+	import tools from '@/service/tools.js'
 
 	export default {
 		props:{

components/en-from/en-upload/en-upload.vue

@@ -35,8 +35,8 @@
 </template>
 
 <script>
-import tools from "@/common/js/tools";
-import {upLoadingFileOss} from "@/common/js/upLoadingFile";
+import tools from "@/service/tools";
+import {upLoadingFileOss} from "@/service/upLoadingFile";
 
 export default {
   components:{

components/en-list/en-list.vue

@@ -1,11 +1,11 @@
 <template>
   <view class="list">
-    <Blank v-if="list.length<0"></Blank>
+    <Blank v-if="list.length<=0"></Blank>
     <view class="scroll-view" v-else>
-      <scroll-view class="scroll-list" scroll-y="true" style="height: 100%;" @scrolltolower="onReachScollBottom"
+      <scroll-view class="scroll-list" scroll-y="true" :style="listStyle" @scrolltolower="onReachScollBottom"
                    :scroll-top="scrollTop" @scroll="scroll">
         <slot name="listInfo" v-bind:pagingData="list"></slot>
-        <view class="toMore" v-show="isAjax">加载中-----</view>
+        <view class="toMore" v-show="isAjax">加载中...</view>
       </scroll-view>
     </view>
 
@@ -17,6 +17,15 @@ import Blank from 'components/en-utils/en-blank/en-blank'
 
 export default {
   components: {Blank},
+  props:{
+    'height':{
+      default:''
+    },
+    'isAll':{
+      type:Boolean,
+      default:false
+    }
+  },
   data() {
     return {
       list: [],
@@ -24,12 +33,37 @@ export default {
       page: 1,
       total: null,
       isAjax: false,
+      listStyle:{
+        'height':'calc(100vh - env(safe-area-inset-bottom))'
+      }
+    }
+  },
+  watch: {
+    'height':function (){
+      this.setHeight()
+    },
+    'isAll':function () {
+      this.setHeight()
     }
   },
   mounted() {
     this.getList()
+    this.setHeight()
   },
   methods: {
+    setHeight(){
+      if(this.isAll){
+        this.listStyle.height='100vh'
+      }else {
+        if(this.height){
+          if(this.height>0){
+            this.listStyle.height='calc(100vh - env(safe-area-inset-bottom) - '+this.height+'rpx)'
+          }else if(this.height<0){
+            this.listStyle.height='calc(100vh - env(safe-area-inset-bottom) + '+(this.height*-1)+'rpx)'
+          }
+        }
+      }
+    },
     scroll: function (e) {
       this.scrollTop = e.detail.scrollTop
     },
@@ -55,7 +89,7 @@ export default {
       })
       this.total = total
       this.isAjax = false
-      ++this.page;
+      ++this.page
     }
 
   },

components/en-utils/en-nav/en-nav.vue

@@ -28,7 +28,7 @@
 </template>
 
 <script>
-  import tools from "@/common/js/tools";
+  import tools from "@/service/tools";
 
   export default {
     name: "en-nav",

main.js

@@ -4,7 +4,7 @@ import App from './App'
 import {
 	router,
 	RouterMount
-} from './common/router/router.js' //路径换成自己的
+} from './service/router.js' //路径换成自己的
 Vue.use(router)
 // #ifndef VUE3
 import Vue from 'vue'

pages/index/index.vue

@@ -10,7 +10,7 @@
 <!--		<enTextarea v-model="content" label="个人简介"></enTextarea>-->
 <!--		<enDate v-model="birthday" type="datetime" label="生日生日"></enDate>-->
 		<enHeadImg v-model="img" label="修改头像"></enHeadImg>
-		<enSelect v-model="classIds" label="班级"></enSelect>
+		<enSelect v-model="classIds" :local-data="[]" label="班级"></enSelect>
 <!--		<enUpload v-model="imgs" ></enUpload>-->
 
 

api/ajax.js → service/ajax.js

@@ -1,5 +1,5 @@
-import tools from "@/common/js/tools";
-import store from '@/store/index'
+import tools from "@/service/tools";
+import store from '@/store'
 let BASE_URL ='https://' + process.uniEnv.baseUrl;
 
 

common/js/permission.js → service/permission.js

@@ -1,4 +1,4 @@
-import store from '@/store/index'
+import store from '@/store'
 
 /**
  * 判定认证
@@ -14,4 +14,4 @@ export const isToken = function () {
     });
     return false;
   }
-}
+}

common/router/router.js → service/router.js

@@ -1,8 +1,5 @@
 // router.js
 import { RouterMount, createRouter } from 'uni-simple-router';
-import tools from '@/common/js/tools'
-import store from '@/store/index'
-import { getPlatform } from '@/common/js/utils'
 const router = createRouter({
     platform: process.env.VUE_APP_PLATFORM,
     routes: [...ROUTES]
@@ -41,4 +38,4 @@ router.afterEach((to, from) => {
 export {
     router,
     RouterMount
-}
+}

store/modules/user.js

@@ -1,5 +1,5 @@
 
-import tools from "@/common/js/tools";
+import tools from "@/service/tools";
 
 const state = {
   token: uni.getStorageSync('token') || '',

yarn.lock

@@ -2,12 +2,103 @@
 # yarn lockfile v1
 
 
-"uni-read-pages@^1.0.5":
-  "integrity" "sha512-GkrrZ0LX0vn9R5k6RKEi0Ez3Q3e2vUpjXQ8Z6/K/d28KudI9ajqgt8WEjQFlG5EPm1K6uTArN8LlqmZTEixDUA=="
-  "resolved" "https://registry.npmmirror.com/uni-read-pages/-/uni-read-pages-1.0.5.tgz"
-  "version" "1.0.5"
-
-"uni-simple-router@^2.0.7":
-  "integrity" "sha512-8FKv5dw7Eoonm0gkO8udprrxzin0fNUI0+AvIphFkFRH5ZmP5ZWJ2pvnWzb2NiiqQSECTSU5VSB7HhvOSwD5eA=="
-  "resolved" "https://registry.npmmirror.com/uni-simple-router/-/uni-simple-router-2.0.7.tgz"
-  "version" "2.0.7"
+"@babel/parser@^7.18.4":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.4.tgz#94003fdfc520bbe2875d4ae557b43ddb6d880f17"
+  integrity sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw==
+
+"@types/html5plus@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@types/html5plus/-/html5plus-1.0.2.tgz#43e1aaca4584e7e2cf0db082389f42fbba98062c"
+  integrity sha512-OklP5lrmLq8/6TUOLgWc0LndUVvAiTWX5dnyoCFhIUtFW9opWsnCtG/UxPgeuC28Rv2XNbFfft/hEEI39P/4Ag==
+
+"@types/uni-app@^1.4.4":
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/@types/uni-app/-/uni-app-1.4.4.tgz#fe73d0e7c89d5e750605e088ff6695846e019c36"
+  integrity sha512-ZTXnrCTblZyoLIoKbTv1Whz1nxrTcM7vg0qGXzDpXP8m9MqdjKt48N3FffQT1IsJWNkxbvJ1Eg5UHDaq+k+oBQ==
+  dependencies:
+    vue "^2.6.8"
+
+"@vue/compiler-sfc@2.7.14":
+  version "2.7.14"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-2.7.14.tgz#3446fd2fbb670d709277fc3ffa88efc5e10284fd"
+  integrity sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA==
+  dependencies:
+    "@babel/parser" "^7.18.4"
+    postcss "^8.4.14"
+    source-map "^0.6.1"
+
+crypto-js@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.1.1.tgz#9e485bcf03521041bd85844786b83fb7619736cf"
+  integrity sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==
+
+csstype@^3.1.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b"
+  integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==
+
+js-base64@^2.6.4:
+  version "2.6.4"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4"
+  integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==
+
+nanoid@^3.3.4:
+  version "3.3.6"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c"
+  integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
+
+picocolors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
+  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
+
+postcss@^8.4.14:
+  version "8.4.21"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.21.tgz#c639b719a57efc3187b13a1d765675485f4134f4"
+  integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==
+  dependencies:
+    nanoid "^3.3.4"
+    picocolors "^1.0.0"
+    source-map-js "^1.0.2"
+
+source-map-js@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
+  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
+
+source-map@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
+uni-read-pages@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.npmmirror.com/uni-read-pages/-/uni-read-pages-1.0.5.tgz"
+  integrity sha512-GkrrZ0LX0vn9R5k6RKEi0Ez3Q3e2vUpjXQ8Z6/K/d28KudI9ajqgt8WEjQFlG5EPm1K6uTArN8LlqmZTEixDUA==
+
+uni-simple-router@^2.0.7:
+  version "2.0.7"
+  resolved "https://registry.npmmirror.com/uni-simple-router/-/uni-simple-router-2.0.7.tgz"
+  integrity sha512-8FKv5dw7Eoonm0gkO8udprrxzin0fNUI0+AvIphFkFRH5ZmP5ZWJ2pvnWzb2NiiqQSECTSU5VSB7HhvOSwD5eA==
+
+uploading-oss@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/uploading-oss/-/uploading-oss-1.0.3.tgz#87aaca65a4d2028f099f19ef9e45d412acf6e5e4"
+  integrity sha512-aqHh5NCOBcrA4d8yCIKR7B9GrKzH88X7gL8BSvIw18pi79AgWnhDkCoyjQmDqzTvjQqYfKwyFTEgnafzMx/GbQ==
+  dependencies:
+    crypto-js "^4.1.1"
+    js-base64 "^2.6.4"
+
+vue-waterfall-easy@^2.4.4:
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/vue-waterfall-easy/-/vue-waterfall-easy-2.4.4.tgz#a990ef3f7f7eb88dedc5ef40e064c4e68908e84c"
+  integrity sha512-5OkpT2FPNC3rHBy858zk/nmJxqdPaGmj/KVbmA6dgcvtsovKMa+zuf/Z7F+S2NnObeavpIBztTWgcH3S42ZD+g==
+
+vue@^2.6.8:
+  version "2.7.14"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-2.7.14.tgz#3743dcd248fd3a34d421ae456b864a0246bafb17"
+  integrity sha512-b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ==
+  dependencies:
+    "@vue/compiler-sfc" "2.7.14"
+    csstype "^3.1.0"