feat:倒计时方法；styles:css-loyout处理

config/index.js

@@ -4,4 +4,10 @@ const env = {
     develop: 'https://www.rmrfjune.cn' // 开发版
 }
 
+// #ifdef MP-WEIXIN
 export const baseUrl = env[__wxConfig.envVersion]
+// #endif
+
+// #ifndef MP-WEIXIN
+export const baseUrl = process.env.NODE_ENV === 'development' ? env.develop : env.release
+// #endif

lib/service/index.js

@@ -17,6 +17,7 @@ function validateOps(options = {}) {
 	return validator.validate()
 }
 
+// 请求
 export function request (options) {
     const valite_err = validateOps(options)
 	if(valite_err) return Toast({title: valite_err})
@@ -69,3 +70,12 @@ export function request (options) {
         })
     })
 }
+
+// 上传文件
+// export function upload() {
+// 	return new Promise((resolve, reject) => {
+// 		uni.uploadFile({
+			
+// 		})
+// 	})
+// }

main.js

 import Vue from 'vue'
 import App from './App'
-import store from './store'
-import "@/utils/vue_prototype.js"
+import store from './store'
+
+import "@/utils/vue_prototype.js" // 常用方法
 
 Vue.config.productionTip = false
 

pages.json

@@ -3,19 +3,19 @@
 		{
 			"path": "pages/home/index",
 			"style": {
-				"navigationBarTitleText": "uni-app"
+				"navigationBarTitleText": "首页"
 			}
 		},
 		{
 			"path": "pages/mine/index",
 			"style": {
-				"navigationBarTitleText": "uni-app"
+				"navigationBarTitleText": "我的"
 			}
 		}
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "uni-app",
+		"navigationBarTitleText": " ",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8"
 	},

pages/home/index.vue

@@ -2,16 +2,19 @@
 	<view class="content">
 		
 		<view class="test">1</view>
+		<view>{{str}}</view>
+		<button type="default" @click="testTime">倒计时测试</button>
 	</view>
 </template>
 
 <script>
-	import { mapState } from 'vuex'
+	import { mapState } from 'vuex'
+	import { timerFn } from '@/utils/common.js'
 	import { test } from '@/apis/test.js'
 	export default {
 		data() {
 			return {
-				
+				str: ""
 			}
 		},
 		computed: {
@@ -23,7 +26,11 @@
 			console.log(a)
 		},
 		methods: {
-
+			testTime() {
+				timerFn(10, num => {
+					this.str = num
+				})
+			}
 		}
 	}
 </script>

styles/layout.css

@@ -24,86 +24,6 @@
 .flex-4{ flex: 4; }
 .flex-5{ flex: 5; }
 
-/*  -- 内外边距 -- */
-.m-0 { margin: 0; }
-.m-1 { margin: 10rpx; }
-.m-2 { margin: 20rpx; }
-.m-3 { margin: 30rpx; }
-.m-4 { margin: 40rpx; }
-.m-5 { margin: 50rpx; }
-.mt-0 { margin-top: 0; }
-.mt-1 { margin-top: 10rpx; }
-.mt-2 { margin-top: 20rpx; }
-.mt-3 { margin-top: 30rpx; }
-.mt-4 { margin-top: 40rpx; }
-.mt-5 { margin-top: 50rpx; }
-.mb-0 { margin-bottom: 0; }
-.mb-1 { margin-bottom: 10rpx; }
-.mb-2 { margin-bottom: 20rpx; }
-.mb-3 { margin-bottom: 30rpx; }
-.mb-4 { margin-bottom: 40rpx; }
-.mb-5 { margin-bottom: 50rpx; }
-.ml-0 { margin-left: 0; }
-.ml-1 { margin-left: 10rpx; }
-.ml-2 { margin-left: 20rpx; }
-.ml-3 { margin-left: 30rpx; }
-.ml-4 { margin-left: 40rpx; }
-.ml-5 { margin-left: 50rpx; }
-.mr-0 { margin-right: 0; }
-.mr-1 { margin-right: 10rpx; }
-.mr-2 { margin-right: 20rpx; }
-.mr-3 { margin-right: 30rpx; }
-.mr-4 { margin-right: 40rpx; }
-.mr-5 { margin-right: 50rpx; }
-.my-0 { margin-top: 0; margin-bottom: 0; }
-.my-1 { margin-top: 10rpx; margin-bottom: 10rpx; }
-.my-2 { margin-top: 20rpx; margin-bottom: 20rpx; }
-.my-3 { margin-top: 30rpx; margin-bottom: 30rpx; }
-.my-4 { margin-top: 40rpx; margin-bottom: 40rpx; }
-.my-5 { margin-top: 50rpx; margin-bottom: 50rpx; }
-.mx-0 { margin-left: 0; margin-right: 0; }
-.mx-1 { margin-left: 10rpx; margin-right: 10rpx; }
-.mx-2 { margin-left: 20rpx; margin-right: 20rpx; }
-.mx-3 { margin-left: 30rpx; margin-right: 30rpx; }
-.mx-4 { margin-left: 40rpx; margin-right: 40rpx; }
-.mx-5 { margin-left: 50rpx; margin-right: 50rpx; }
-
-.p-1 { padding: 10rpx; }
-.p-2 { padding: 20rpx; }
-.p-3 { padding: 30rpx; }
-.p-4 { padding: 40rpx; }
-.p-5 { padding: 50rpx; }
-.pt-1 { padding-top: 10rpx; }
-.pt-2 { padding-top: 20rpx; }
-.pt-3 { padding-top: 30rpx; }
-.pt-4 { padding-top: 40rpx; }
-.pt-5 { padding-top: 50rpx; }
-.pb-1 { padding-bottom: 10rpx; }
-.pb-2 { padding-bottom: 20rpx; }
-.pb-3 { padding-bottom: 30rpx; }
-.pb-4 { padding-bottom: 40rpx; }
-.pb-5 { padding-bottom: 50rpx; }
-.pl-1 { padding-left: 10rpx; }
-.pl-2 { padding-left: 20rpx; }
-.pl-3 { padding-left: 30rpx; }
-.pl-4 { padding-left: 40rpx; }
-.pl-5 { padding-left: 50rpx; }
-.pr-1 { padding-right: 10rpx; }
-.pr-2 { padding-right: 20rpx; }
-.pr-3 { padding-right: 30rpx; }
-.pr-4 { padding-right: 40rpx; }
-.pr-5 { padding-right: 50rpx; }
-.py-1 { padding-top: 10rpx; padding-bottom: 10rpx; }
-.py-2 { padding-top: 20rpx; padding-bottom: 20rpx; }
-.py-3 { padding-top: 30rpx; padding-bottom: 30rpx; }
-.py-4 { padding-top: 40rpx; padding-bottom: 40rpx; }
-.py-5 { padding-top: 50rpx; padding-bottom: 50rpx; }
-.px-1 { padding-left: 10rpx; padding-right: 10rpx; }
-.px-2 { padding-left: 20rpx; padding-right: 20rpx; }
-.px-3 { padding-left: 30rpx; padding-right: 30rpx; }
-.px-4 { padding-left: 40rpx; padding-right: 40rpx; }
-.px-5 { padding-left: 50rpx; padding-right: 50rpx; }
-
 /* 文字对齐 */
 .text-left { text-align: left; }
 .text-right { text-align: right; }

utils/common.js

+import { isFunction } from "@/utils/types.js"
+/**
+ * @desc 倒计时
+ * @param { Number } num 倒计时时间
+ * @param { Functiom } cb 回调 
+ */
+export function timerFn(num = 60, cb) {
+	let timer = setInterval(() => {
+		cb && isFunction(cb) && cb.call(this, num)
+		num --
+		if(num < 0) {
+			clearInterval(timer)
+			timer = null
+			return
+		}
+	}, 1000)
+}
\ No newline at end of file