杂项修改

common/config_gyq.js

@@ -45,5 +45,7 @@ var config = {
 	
 	//修改用户昵称、头像
 	API_USER_MODIFY_USER_INFO: api_web_url +'?r=user/modify-user-info',
+	//用户信息,
+	API_USER_INFO: api_web_url +'?r=user/info',
 };
 module.exports = config;

common/storage.js

@@ -1,3 +1,8 @@
+
+import {
+	QINIU_URL
+} from '@/common/constant'
+import i18n from '../locale/index.js'
 // 存储
 const STORAGE_USER_TOKEN = 'storage_user_token';
 const PRODUCTS_TO_ORDER = 'products_to_order';
@@ -21,6 +26,82 @@ const USER_INFO_DATA = 'USER_INFO_DATA';
 
 const IS_BUY_MODEL = 'IS_BUY_MODEL';
 
+const FUNCTIONTAG = 'FUNCTIONTAG'
+
+const ICONS = {
+	lock: `${QINIU_URL}FgMCTZCySvEgLYgkzU65BUR4f4Ls`,
+	edit: `${QINIU_URL}Fq3V1Zi5tKH7ibTwG1nO7N96CU8m`,
+	add: `${QINIU_URL}FqLEWbMe8DcnQtNz6GdDDD87ObZK`,
+	placeholder: `${QINIU_URL}FpKvfFNSDbx0d9RDwyGAQdFb7Kt6`
+}
+const functionTag = [
+	{
+		name: i18n.t('开机'),
+		iconUrl: `${QINIU_URL}Fp5T9lSNakoiioji6S7W4DmFQ_ys`,
+		isSelect:true,
+		index:0,
+		isLock: true
+	},
+	{
+		name: i18n.t('闪灯鸣笛'),
+		isSelect:true,
+		index:1,
+		iconUrl: `${QINIU_URL}FpeQsDh2dbeTullNLI-HhWj4WAQS`
+	},
+	{
+		name: i18n.t('打开座桶'),
+		isSelect:true,
+		index:2,
+		iconUrl: `${QINIU_URL}FppwhbFzrEmDeJQgZJtDTu6WOoMZ`
+	},
+	{
+		name: i18n.t('打开尾箱'),
+		isSelect:true,
+		index:3,
+		iconUrl: `${QINIU_URL}Fv3KLuYWEeV5IM4_2sMbmur7yZtz`
+	},
+	{
+		name: i18n.t('胎压'),
+		isSelect:false,
+		index:4,
+		iconUrl: `${QINIU_URL}FmbcjmvoB4J3CT1hrbjNX4kxv9Zq`
+	},
+	{
+		name: i18n.t('点出信息'),
+		isSelect:false,
+		index:5,
+		iconUrl: `${QINIU_URL}Fnx_4tLoq1ytvVA0UemepWisI73A`
+	},
+	{
+		name: i18n.t('导航'),
+		isSelect:false,
+		index:6,
+		iconUrl: `${QINIU_URL}FrA_ouJtDp-39g7rMBI0EYr2czVE`
+	}
+]
+
+
+function setFunctionTag(tag = []){
+	uni.setStorageSync(FUNCTIONTAG, tag);
+}
+
+function getFunctionTag(){
+	let list = uni.getStorageSync(FUNCTIONTAG) || functionTag
+	let activeTag = []
+	let tag = []
+	list.map(item=>{
+		if(item.isSelect){
+			activeTag.push(item)
+		}else{
+			tag.push(item)
+		}
+	})
+	return {
+		activeTag,
+		tag,
+	}
+}
+
 
 function setIsLocationAuth(location_auth) {
 	uni.setStorageSync(IS_LOCATION_AUTH, location_auth);
@@ -124,6 +205,7 @@ function setUserCurrentLocation(
 ) {
 	uni.setStorageSync(USER_CURRENT_LOCATION, location_info);
 }
+
 function getUserCurrentLocation() {
 	return uni.getStorageSync(USER_CURRENT_LOCATION);
 }
@@ -193,6 +275,6 @@ module.exports = {
 	getShareCode: getShareCode,
 	setIsLocationAuth: setIsLocationAuth,
 	getIsLocationAuth: getIsLocationAuth,
-	getIsBuyModel:getIsBuyModel,
-	setIsBuyModel:setIsBuyModel
+	getIsBuyModel: getIsBuyModel,
+	setIsBuyModel: setIsBuyModel
 };

component/customTabbar/index.vue

@@ -29,8 +29,6 @@ const http = require('@/common/http.js');
 const config = require('@/common/config.js');
 const common = require('@/common/common.js');
 const appWhiteListFilter = require('@/common/appWhiteListFilter.js');
-
-
 export default {
   props: {
     curtTab: {

components/basic-drag/index.vue

@@ -0,0 +1,266 @@
+<template>
+	<movable-area :style="[getAreaStyle]">
+		<movable-view
+			v-for="(item, index) in list"
+			:animation="animation"
+			:direction="direction"
+			:key="item.key"
+			:damping="damping"
+			:x="item.x"
+			:y="item.y"
+			:disabled="longpress ? disabled : false"
+			@longpress="handleLongpress"
+			@touchstart="handleDragStart(index)"
+			@change="handleMoving"
+			@touchend="handleDragEnd"
+			:style="[getViewStyle]"
+			class="base-drag-wrapper"
+			:class="{ active: activeIndex === index }"
+		>
+			<!-- #ifdef MP-WEIXIN -->
+			<view class="drag-item">
+				<view  :class="['tab-item']" @longpress="toggleEdit"
+				  @tap="deleteTab(item)">
+				  <image v-if="item.isLock && isActiveEdit" :src="icons.lock" class="right-icon" />
+				  <image v-if="getMovableItem(item)" :src="icons.edit" class="right-icon" />
+				  <image :src="item.iconUrl" class="icon" />
+				  <view :class="['name', getMovableItem(item) && 'shake']">{{ item.name }}</view>
+				</view>
+			</view>
+			
+			<!-- #endif -->
+
+			<!-- #ifndef MP-WEIXIN -->
+			<slot name="item" :element="item" :index="index"></slot>
+			<!-- #endif -->
+		</movable-view>
+	</movable-area>
+</template>
+
+<script>
+export default {
+	props: {
+		column: {
+			type: Number,
+			default: 3
+		},
+		value: {
+			type: Array,
+			default: () => []
+		},
+		width: {
+			type: String,
+			default: '100%'
+		},
+		height: {
+			type: String,
+			default: 'auto'
+		},
+		itemKey: {
+			type: String,
+			required: true
+		},
+		itemHeight: {
+			type: String,
+			default: '100px'
+		},
+		direction: {
+			type: String,
+			default: 'all',
+			validator: value => {
+				return ['all', 'vertical', 'horizontal', 'none'].includes(value);
+			}
+		},
+		animation: {
+			type: Boolean,
+			default: true
+		},
+		damping: {
+			type: Number,
+			default: 20
+		},
+		longpress: {
+			type: Boolean,
+			default: true
+		}
+	},
+	data() {
+		return {
+			list: [],
+			disabled: true,
+			activeIndex: -1,
+			moveToIndex: -1,
+			oldIndex: -1,
+			tempDragInfo: {
+				x: '',
+				y: ''
+			},
+			cloneList: []
+		};
+	},
+	computed: {
+		getAreaStyle() {
+			const width = this.getRealWidth(this.width);
+			return { width: width + 'px', height: this.height !== 'auto' ? this.height : Math.round(this.list.length / this.column) * this.getItemHeight + 'px' };
+		},
+		getViewStyle() {
+			const { itemHeight, getItemWidth } = this;
+			return { width: getItemWidth + 'px', height: itemHeight };
+		},
+		getItemHeight() {
+			return parseFloat(this.itemHeight);
+		},
+		getItemWidth() {
+			if (this.column === 0) return;
+			const width = this.getRealWidth(this.width);
+			return (parseFloat(width) / this.column).toFixed(2);
+		}
+	},
+	methods: {
+		deleteTab(tab) {
+		  if (tab.isLock) return
+		  const index = this.activeTabs.findIndex(t => t.name === tab.name)
+		  if (index !== -1) {
+		    const removedTab = this.activeTabs.splice(index, 1)[0]
+		    this.toBeSelectTabs.push(removedTab)
+		    this.addPlaceholders()
+		  }
+		},
+		toggleEdit() {
+		  this.isActiveEdit = !this.isActiveEdit
+		},
+		//获取实际的宽度
+		getRealWidth(width) {
+			if (width.includes('%')) {
+				const windowWidth = uni.getSystemInfoSync().windowWidth;
+				width = windowWidth * (parseFloat(width) / 100);
+			}
+			return width;
+		},
+
+		initList(list = []) {
+			const newList = this.deepCopy(list);
+			this.list = newList.map((item, index) => {
+				const [x, y] = this.getPosition(index);
+				return {
+					...item,
+					x,
+					y,
+					key: Math.random() + index
+				};
+			});
+			this.cloneList = this.deepCopy(this.list);
+		},
+
+		//长按
+		handleLongpress() {
+			this.disabled = false;
+		},
+
+		//拖拽开始
+		handleDragStart(index) {
+			this.activeIndex = index;
+			this.oldIndex = index;
+		},
+
+		//拖拽中
+		handleMoving(e) {
+			if (e.detail.source !== 'touch') return;
+			const { x, y } = e.detail;
+			Object.assign(this.tempDragInfo, { x, y });
+			const currentX = Math.floor((x + this.getItemWidth / 2) / this.getItemWidth);
+			const currentY = Math.floor((y + this.getItemHeight / 2) / this.getItemHeight);
+
+			this.moveToIndex = Math.min(currentY * this.column + currentX, this.list.length - 1);
+
+			if (this.oldIndex !== this.moveToIndex && this.oldIndex !== -1 && this.moveToIndex !== -1) {
+				const newList = this.deepCopy(this.cloneList);
+				newList.splice(this.moveToIndex, 0, ...newList.splice(this.activeIndex, 1));
+
+				this.list.forEach((item, index) => {
+					if (index !== this.activeIndex) {
+						const itemIndex = newList.findIndex(val => val[this.itemKey] === item[this.itemKey]);
+						[item.x, item.y] = this.getPosition(itemIndex);
+					}
+				});
+				this.oldIndex = this.moveToIndex;
+			}
+		},
+
+		//获取当前的位置
+		getPosition(index) {
+			const x = (index % this.column) * this.getItemWidth;
+			const y = Math.floor(index / this.column) * this.getItemHeight;
+			return [x, y];
+		},
+
+		//拖拽结束
+		handleDragEnd(e) {
+			if (this.disabled) return;
+			if (this.moveToIndex !== -1 && this.activeIndex !== -1 && this.moveToIndex !== this.activeIndex) {
+				this.cloneList.splice(this.moveToIndex, 0, ...this.cloneList.splice(this.activeIndex, 1));
+			} else {
+				this.$set(this.list[this.activeIndex], 'x', this.tempDragInfo.x);
+				this.$set(this.list[this.activeIndex], 'y', this.tempDragInfo.y);
+			}
+			this.initList(this.cloneList);
+			const endList = this.list.map(item => this.omit(item, ['x', 'y', 'key']));
+			this.$emit('input', endList);
+			this.$emit('end', endList);
+
+			this.activeIndex = -1;
+			this.oldIndex = -1;
+			this.moveToIndex = -1;
+			this.disabled = true;
+		},
+
+		deepCopy(source) {
+			return JSON.parse(JSON.stringify(source));
+		},
+
+		/**
+		 * 排除掉obj里面的key值
+		 * @param {object} obj
+		 * @param {Array|string} args
+		 * @returns {object}
+		 */
+		omit(obj, args) {
+			if (!args) return obj;
+			const newObj = {};
+			const isString = typeof args === 'string';
+			const keys = Object.keys(obj).filter(item => {
+				if (isString) {
+					return item !== args;
+				}
+				return !args.includes(item);
+			});
+
+			keys.forEach(key => {
+				if (obj[key] !== undefined) newObj[key] = obj[key];
+			});
+			return newObj;
+		}
+	},
+	watch: {
+		value: {
+			handler() {
+				this.initList(this.value);
+			},
+			immediate: true,
+			deep: true
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.base-drag-wrapper {
+	opacity: 1;
+	z-index: 1;
+	&.active {
+		opacity: 0.7;
+		transform: scale(1.3);
+		z-index: 99;
+	}
+}
+</style>

locale/index.js

@@ -1,6 +1,14 @@
 import en from './en.json'
 import zh from './zh.json'
-export default {
-	en,
-	zh
+import Vue from 'vue';
+import VueI18n from 'vue-i18n'
+Vue.use(VueI18n);
+let i18nConfig = {
+	locale: "zh",
+	messages: {
+		en,
+		zh
+	}
 }
+let i18n = new VueI18n(i18nConfig)
+export default i18n

main.js

@@ -7,24 +7,16 @@ Polyfill.init();
 
 // 全局mixins，用于实现setData等功能，请勿删除！';
 import Mixin from './polyfill/mixins';
-import messages from './locale/index'
+import i18n from './locale/index'
 import uView from "uview-ui";
 
 Vue.use(uView);
 
-let i18nConfig = {
-	 locale: "zh",
-	//locale: uni.getLocale(),
-	messages 
-}
 
 // #ifndef VUE3
 import Vue from 'vue';
 
 Vue.mixin(Mixin);
-import VueI18n from 'vue-i18n'
-Vue.use(VueI18n)
-const i18n = new VueI18n(i18nConfig)
 Vue.config.productionTip = false;
 App.mpType = 'app';
 const app = new Vue({
@@ -34,18 +26,18 @@ const app = new Vue({
 app.$mount();
 // #endif
 
-// #ifdef VUE3
-import { createSSRApp } from 'vue';
-import {
-	createI18n
-} from 'vue-i18n'
-const i18n = createI18n(i18nConfig)
-export function createApp() {
-    const app = createSSRApp(App);
-	app.use(i18n)
-    app.mixin(Mixin);
-    return {
-        app
-    };
-}
-// #endif
+// // #ifdef VUE3
+// import { createSSRApp } from 'vue';
+// import {
+// 	createI18n
+// } from 'vue-i18n'
+// const i18n = createI18n(i18nConfig)
+// export function createApp() {
+//     const app = createSSRApp(App);
+// 	app.use(i18n)
+//     app.mixin(Mixin);
+//     return {
+//         app
+//     };
+// }
+// // #endif

pages/carFunctionSet/more.vue

@@ -14,6 +14,9 @@
           <view :class="['name', getMovableItem(tab) && 'shake']">{{ tab.name }}</view>
         </view>
       </draggable>
+	  
+	  <basic-drag v-model="list" :column="3" itemKey="title"></basic-drag>
+	  
     </view>
     <view class="fn-wrap">
       <view class="title">{{ $t('其他功能') }}</view>
@@ -34,7 +37,7 @@
 <script>
 // import draggable from 'vuedraggable'
 import { QINIU_URL } from '@/common/constant'
-
+import BasicDrag from '@/components/basic-drag/index.vue';
 const ICONS = {
   lock: `${QINIU_URL}FgMCTZCySvEgLYgkzU65BUR4f4Ls`,
   edit: `${QINIU_URL}Fq3V1Zi5tKH7ibTwG1nO7N96CU8m`,
@@ -45,6 +48,7 @@ const ICONS = {
 export default {
   components: {
     // draggable
+	BasicDrag
   },
   data() {
     const MAX_TAB_LEN = 4

pages/index/components/control/control.vue

@@ -17,7 +17,7 @@
 				<img class="contril-item-img" src="https://qiniu.bms16.com/FjgrfPEufqSzOxb6Aobuc_bbbtJE" alt="">
 				<text>{{$t("打开尾箱")}}</text>
 			</view>
-			<view class="contril-item flex-row" @tap="tapOpenMore">
+			<view class="contril-item flex-row" @tap="toMoreFunctionSet">
 				<img class="contril-item-img" src="https://qiniu.bms16.com/Ft3pNyStT22LP8Ds1Mru2LoTHadx" alt="">
 				<text>{{$t("更多功能")}}</text>
 			</view>
@@ -40,7 +40,7 @@
 				<view class="sure-btn ok-btn" >确定</view>
 			</view>
 		</u-popup> -->
-		<view v-if="isShowMore" class="show-more">
+		<!-- <view v-if="isShowMore" class="show-more">
 			<view class="more-info">
 				<view class="flex-row flex-between model-title">
 					<view>{{$t("更多功能")}}</view>
@@ -68,7 +68,9 @@
 				</view>
 			</view>
 		</view>
-    </view>
+   -->
+   
+	</view>
 </template>
 
 <script>
@@ -104,7 +106,7 @@ export default {
 			this.popupShow=false
 		},
 		tapOpenMore(){
-			this.isShowMore=true
+			// this.isShowMore=true
 		},
 		closeMore(){
 			this.isShowMore=false

pages/my/my.vue

@@ -53,6 +53,10 @@
   import Confirm from '@/component/comPopup/Confirm'
   import { QINIU_URL, defaultHeadImg } from '@/common/constant'
   import CustomTabbar from '@/component/customTabbar/index'
+  
+  var config = require('../../common/config_gyq.js');
+  var http = require('../../common/request.js');
+  
   export default {
     components: {
       Confirm,
@@ -98,10 +102,14 @@
       user_token && this.loadUserInfo()
     },
     methods: {
-      loadUserInfo() {
+      async loadUserInfo() {
         const userInfo = storage.getUserInfoData()
-        console.log('userInfo', userInfo)
         this.setData({ userInfo })
+		let {data} = await http.postApi(config.API_USER_INFO,{})
+		if(data.code == 200){
+			this.userInfo = data.data.userInfo
+			storage.setUserInfoData(this.userInfo)
+		}
       },
       loginHandle() {
         uni.navigateTo({ url: '/pages/loginRegister/login' })

pages/my/set.vue

@@ -1,6 +1,6 @@
 <template>
     <view class="set-page zx-container">
-      <image :src="userInfo.headImg || defaultHeadImg" class="head-img" />
+      <image @click="editAvatarFn" :src="userInfo.headimg || defaultHeadImg" class="head-img" />
       <view class="list-wrap">
         <view
           v-for="(item, index) in list"
@@ -10,7 +10,7 @@
         >
           <view class="title">{{ item.title }}</view>
           <view :class="['text-right', item.hideArrow && 'hide-arrow']">
-			  <input class="inp" @input="inpfn" v-if="item.textProp == 'nickname'" v-model="userInfo[item.textProp]" type="text" />
+			  <input class="inp" @blur="inpfn" v-if="item.textProp == 'nickname'" v-model="userInfo[item.textProp]" type="text" />
 			  <block v-else>
 				  {{ userInfo[item.textProp] || '' }}
 			  </block>
@@ -51,21 +51,24 @@
     methods: {
 		 inpfn(e){
 			console.log(e.detail.value)
+			this.editUserInfoFn()
 		},
 		editAvatarFn(){
-			common.upLoadImgQiNiu( (imgUrl)=> {
-			   console.log(imgUrl)
+			let _this = this
+			common.upLoadImgQiNiu((imgUrl)=> {
+				_this.userInfo.headimg = imgUrl
+				_this.editUserInfoFn()
 			});
 		},
 		async editUserInfoFn(){
 			let {data} = await http.postApi(config.API_USER_MODIFY_USER_INFO,{
 				nickname:this.userInfo.nickname,
-				head_img:this.userInfo.head_img,
+				head_img:this.userInfo.headimg,
 			})
+			storage.setUserInfoData(this.userInfo)
 		},
       loadUserInfo() {
         const userInfo = storage.getUserInfoData()
-        console.log('userInfo', userInfo)
         this.setData({ userInfo })
       },
       routerLink(url) {