lhl 2 年之前
父節點
當前提交
a9e3d4b20a
共有 13 個文件被更改,包括 821 次插入763 次删除
  1. 286 246
      App.vue
  2. 1 1
      api/login.js
  3. 二進制
      baseinfo/nzhnzlbsr.keystore
  4. 8 1
      hybrid/html/js/utils.js
  5. 3 3
      manifest.json
  6. 507 507
      pages/index/index.vue
  7. 2 0
      pages/public/forget.vue
  8. 3 0
      pages/public/login.vue
  9. 2 1
      pages/user/respwd.vue
  10. 6 1
      store/index.js
  11. 1 1
      unpackage/dist/build/h5/index.html
  12. 1 1
      utils/request.js
  13. 1 1
      utils/socket.js

+ 286 - 246
App.vue

@@ -1,269 +1,309 @@
 <script>
-/**
- * vuex管理登陆状态,具体可以参考官方登陆模板示例
- */
-import { mapMutations } from 'vuex';
-// #ifdef H5
-import { weixindata, setRouter } from './utils/wxAuthorized';
-// #endif
-// #ifdef APP-PLUS
-import { getUpApp } from './utils/upApp.js';
-// #endif
-export default {
-	data() {
-		return {
-			/* 保存微信信息 */
-			appData: {}
-		};
-	},
-	methods: {
-		...mapMutations('user', ['setUserInfo', 'login', 'hasLogin'])
-	},
-	onLaunch: function(urlObj) {
-		let obj = this;
-		let lang = 'zh_tw';
-		uni.setStorageSync('lang', lang);
-		// 加载缓存中的用户信息
-		let userInfo = uni.getStorageSync('userInfo') || '';
-		// 判断是否拥有用户信息
-		if (userInfo.id) {
-			//更新登陆状态
-			uni.getStorage({
-				key: 'userInfo',
-				success: res => {
-					obj.setUserInfo(res.data);
-					obj.login(res.data);
-				}
-			});
+	/**
+	 * vuex管理登陆状态,具体可以参考官方登陆模板示例
+	 */
+	import {
+		mapMutations
+	} from 'vuex';
+	// #ifdef H5
+	import {
+		weixindata,
+		setRouter
+	} from './utils/wxAuthorized';
+	// #endif
+	// #ifdef APP-PLUS
+	import {
+		getUpApp
+	} from './utils/upApp.js';
+	// #endif
+	export default {
+		data() {
+			return {
+				/* 保存微信信息 */
+				appData: {}
+			};
+		},
+		methods: {
+			...mapMutations('user', ['setUserInfo', 'login', 'hasLogin']),
+			...mapMutations(['setBaseURl'])
+		},
+		onLaunch: function(urlObj) {
+			let obj = this;
+			// #ifdef H5
+			// let baseURL = window.location.protocol + '//' + window.location.host
+			// obj.setBaseURl(baseURL)
+			// #endif
+			let lang = 'zh_tw';
+			uni.setStorageSync('lang', lang);
+			// 加载缓存中的用户信息
+			let userInfo = uni.getStorageSync('userInfo') || '';
+			// 判断是否拥有用户信息
+			if (userInfo.id) {
+				//更新登陆状态
+				uni.getStorage({
+					key: 'userInfo',
+					success: res => {
+						obj.setUserInfo(res.data);
+						obj.login(res.data);
+					}
+				});
+			}
+			// #ifdef H5
+			// 保存路由对象
+			setRouter(this.$router);
+			//判断是否已经缓存浏览器
+			let bool = uni.getStorageSync('weichatBrowser') || '';
+			if (bool === '') {
+				//判断是否为微信浏览
+				bool = navigator.userAgent.toLowerCase().match(/MicroMessenger/i) == 'micromessenger';
+				// 保存当前是否为微信内核浏览器
+				uni.setStorageSync('weichatBrowser', bool);
+			}
+			if (bool) {
+				// 加载微信信息
+				// weixindata();
+			}
+			// #endif
+			// #ifdef APP-PLUS
+			// 判断是否升级
+			getUpApp();
+			// 获取当前运行系统
+			let system = uni.getStorageSync('platform') || '';
+			if (!system) {
+				uni.setStorage({
+					key: 'platform',
+					data: uni.getSystemInfoSync().platform
+				});
+			}
+			// #endif
+		},
+		onShow: function() {
+			// 加载拦截
+			// console.log('App Show');
+		},
+		onHide: function() {
+			// console.log('App Hide');
 		}
-		// #ifdef H5
-		// 保存路由对象
-		setRouter(this.$router);
-		//判断是否已经缓存浏览器
-		let bool = uni.getStorageSync('weichatBrowser') || '';
-		if (bool === '') {
-			//判断是否为微信浏览
-			bool = navigator.userAgent.toLowerCase().match(/MicroMessenger/i) == 'micromessenger';
-			// 保存当前是否为微信内核浏览器
-			uni.setStorageSync('weichatBrowser', bool);
-		}
-		if (bool) {
-			// 加载微信信息
-			// weixindata();
-		}
-		// #endif
-		// #ifdef APP-PLUS
-		// 判断是否升级
-		getUpApp();
-		// 获取当前运行系统
-		let system = uni.getStorageSync('platform') || '';
-		if (!system) {
-			uni.setStorage({
-				key: 'platform',
-				data: uni.getSystemInfoSync().platform
-			});
-		}
-		// #endif
-	},
-	onShow: function() {
-		// 加载拦截
-		// console.log('App Show');
-	},
-	onHide: function() {
-		// console.log('App Hide');
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-@import 'uview-ui/index.scss';
-/*全局公共样式和字体图标*/
-@import '/static/css/cmy.css';
-view,
-scroll-view,
-swiper,
-swiper-item,
-cover-view,
-cover-image,
-icon,
-text,
-rich-text,
-progress,
-button,
-checkbox,
-form,
-input,
-label,
-radio,
-slider,
-switch,
-textarea,
-navigator,
-audio,
-camera,
-image,
-video {
-	box-sizing: border-box;
-}
-/* 骨架屏替代方案 */
-.Skeleton {
-	background: #f3f3f3;
-	padding: 20rpx 0;
-	border-radius: 8rpx;
-}
-
-/* 图片载入替代方案 */
-.image-wrapper {
-	font-size: 0;
-	background: #f3f3f3;
-	border-radius: 4px;
-	image {
-		width: 100%;
-		height: 100%;
-		transition: 0.6s;
-		opacity: 0;
-		&.loaded {
-			opacity: 1;
+	@import 'uview-ui/index.scss';
+	/*全局公共样式和字体图标*/
+	@import '/static/css/cmy.css';
+
+	view,
+	scroll-view,
+	swiper,
+	swiper-item,
+	cover-view,
+	cover-image,
+	icon,
+	text,
+	rich-text,
+	progress,
+	button,
+	checkbox,
+	form,
+	input,
+	label,
+	radio,
+	slider,
+	switch,
+	textarea,
+	navigator,
+	audio,
+	camera,
+	image,
+	video {
+		box-sizing: border-box;
+	}
+
+	/* 骨架屏替代方案 */
+	.Skeleton {
+		background: #f3f3f3;
+		padding: 20rpx 0;
+		border-radius: 8rpx;
+	}
+
+	/* 图片载入替代方案 */
+	.image-wrapper {
+		font-size: 0;
+		background: #f3f3f3;
+		border-radius: 4px;
+
+		image {
+			width: 100%;
+			height: 100%;
+			transition: 0.6s;
+			opacity: 0;
+
+			&.loaded {
+				opacity: 1;
+			}
 		}
 	}
-}
-
-// 设置富文本中图片最大宽度
-uni-rich-text img {
-	max-width: 100% !important;
-}
-/*边框*/
-.b-b:after,
-.b-t:after {
-	position: absolute;
-	z-index: 3;
-	left: 0;
-	right: 0;
-	height: 0;
-	content: '';
-	transform: scaleY(0.5);
-	border-bottom: 1px solid $border-color-base;
-}
-
-.b-b:after {
-	bottom: 0;
-}
-
-.b-t:after {
-	top: 0;
-}
-
-/* button样式改写 */
-uni-button,
-button {
-	height: 80rpx;
-	line-height: 80rpx;
-	font-size: $font-lg + 2rpx;
-	font-weight: normal;
-
-	&.no-border:before,
-	&.no-border:after {
-		border: 0;
+
+	// 设置富文本中图片最大宽度
+	uni-rich-text img {
+		max-width: 100% !important;
 	}
-}
-
-uni-button[type='default'],
-button[type='default'] {
-	color: $font-color-dark;
-}
-
-/* input 样式 */
-.input-placeholder {
-	color: #999999;
-}
-
-.placeholder {
-	color: #999999;
-}
-// 边距样式
-@for $i from 1 to 4 {
-	.margin-l-#{$i * 10} {
-		margin-left: $i * 10rpx !important;
+
+	/*边框*/
+	.b-b:after,
+	.b-t:after {
+		position: absolute;
+		z-index: 3;
+		left: 0;
+		right: 0;
+		height: 0;
+		content: '';
+		transform: scaleY(0.5);
+		border-bottom: 1px solid $border-color-base;
 	}
-	.margin-r-#{$i * 10} {
-		margin-right: $i * 10rpx !important;
+
+	.b-b:after {
+		bottom: 0;
 	}
-	.margin-t-#{$i * 10} {
-		margin-top: $i * 10rpx !important;
+
+	.b-t:after {
+		top: 0;
 	}
-	.margin-b-#{$i * 10} {
-		margin-bottom: $i * 10rpx !important;
+
+	/* button样式改写 */
+	uni-button,
+	button {
+		height: 80rpx;
+		line-height: 80rpx;
+		font-size: $font-lg + 2rpx;
+		font-weight: normal;
+
+		&.no-border:before,
+		&.no-border:after {
+			border: 0;
+		}
 	}
-	.margin-#{$i * 10} {
-		margin: $i * 10rpx !important;
+
+	uni-button[type='default'],
+	button[type='default'] {
+		color: $font-color-dark;
 	}
-	.margin-v-#{$i * 10} {
-		margin-top: $i * 10rpx !important;
-		margin-bottom: $i * 10rpx !important;
+
+	/* input 样式 */
+	.input-placeholder {
+		color: #999999;
 	}
-	.margin-c-#{$i * 10} {
-		margin-left: $i * 10rpx !important;
-		margin-right: $i * 10rpx !important;
+
+	.placeholder {
+		color: #999999;
 	}
-	.padding-l-#{$i * 10} {
-		padding-left: $i * 10rpx !important;
+
+	// 边距样式
+	@for $i from 1 to 4 {
+		.margin-l-#{$i * 10} {
+			margin-left: $i * 10rpx !important;
+		}
+
+		.margin-r-#{$i * 10} {
+			margin-right: $i * 10rpx !important;
+		}
+
+		.margin-t-#{$i * 10} {
+			margin-top: $i * 10rpx !important;
+		}
+
+		.margin-b-#{$i * 10} {
+			margin-bottom: $i * 10rpx !important;
+		}
+
+		.margin-#{$i * 10} {
+			margin: $i * 10rpx !important;
+		}
+
+		.margin-v-#{$i * 10} {
+			margin-top: $i * 10rpx !important;
+			margin-bottom: $i * 10rpx !important;
+		}
+
+		.margin-c-#{$i * 10} {
+			margin-left: $i * 10rpx !important;
+			margin-right: $i * 10rpx !important;
+		}
+
+		.padding-l-#{$i * 10} {
+			padding-left: $i * 10rpx !important;
+		}
+
+		.padding-r-#{$i * 10} {
+			padding-right: $i * 10rpx !important;
+		}
+
+		.padding-t-#{$i * 10} {
+			padding-top: $i * 10rpx !important;
+		}
+
+		.padding-b-#{$i * 10} {
+			padding-bottom: $i * 10rpx !important;
+		}
+
+		.padding-#{$i * 10} {
+			padding: $i * 10rpx !important;
+		}
+
+		.padding-v-#{$i * 10} {
+			padding-top: $i * 10rpx !important;
+			padding-bottom: $i * 10rpx !important;
+		}
+
+		.padding-c-#{$i * 10} {
+			padding-left: $i * 10rpx !important;
+			padding-right: $i * 10rpx !important;
+		}
+	}
+
+	// 字体大小
+	.font-size-sm {
+		font-size: $font-sm;
 	}
-	.padding-r-#{$i * 10} {
-		padding-right: $i * 10rpx !important;
+
+	.font-size-base {
+		font-size: $font-base;
 	}
-	.padding-t-#{$i * 10} {
-		padding-top: $i * 10rpx !important;
+
+	.font-size-lg {
+		font-size: $font-lg;
 	}
-	.padding-b-#{$i * 10} {
-		padding-bottom: $i * 10rpx !important;
+
+	// 字体颜色
+	.font-color-yellow {
+		color: $color-yellow;
 	}
-	.padding-#{$i * 10} {
-		padding: $i * 10rpx !important;
+
+	.font-color-gray {
+		color: $color-gray;
 	}
-	.padding-v-#{$i * 10} {
-		padding-top: $i * 10rpx !important;
-		padding-bottom: $i * 10rpx !important;
+
+	.font-color-red {
+		color: $color-red;
 	}
-	.padding-c-#{$i * 10} {
-		padding-left: $i * 10rpx !important;
-		padding-right: $i * 10rpx !important;
+
+	.font-color-green {
+		color: $color-green;
+	}
+
+	// 边框颜色
+	.border-color-yellow {
+		border: 1rpx solid $color-yellow;
+	}
+
+	// 修改默认背景颜色
+	uni-page-wrapper {
+		background-color: $page-color-base;
+	}
+
+	page {
+		background-color: $page-color-base;
+		// 设置默认字体
+		font-family: PingFang SC, STHeitiSC-Light, Helvetica-Light, arial, sans-serif, Droid Sans Fallback;
 	}
-}
-// 字体大小
-.font-size-sm {
-	font-size: $font-sm;
-}
-.font-size-base {
-	font-size: $font-base;
-}
-.font-size-lg {
-	font-size: $font-lg;
-}
-// 字体颜色
-.font-color-yellow {
-	color: $color-yellow;
-}
-.font-color-gray {
-	color: $color-gray;
-}
-.font-color-red {
-	color: $color-red;
-}
-.font-color-green {
-	color: $color-green;
-}
-// 边框颜色
-.border-color-yellow {
-	border: 1rpx solid $color-yellow;
-}
-
-// 修改默认背景颜色
-uni-page-wrapper {
-	background-color: $page-color-base;
-}
-page {
-	background-color: $page-color-base;
-	// 设置默认字体
-	font-family: PingFang SC, STHeitiSC-Light, Helvetica-Light, arial, sans-serif, Droid Sans Fallback;
-}
 </style>

+ 1 - 1
api/login.js

@@ -99,7 +99,7 @@ export function getForget(data) {
 export function resetpwd(data) {
 	return request({
 		url: '/Login/resetpwd',
-		method: 'post',
+		method: 'get',
 		data
 	})
 }

二進制
baseinfo/nzhnzlbsr.keystore


+ 8 - 1
hybrid/html/js/utils.js

@@ -24,7 +24,14 @@
 }
 
 // let baseUrl = 'https://aws.okx.com';
-let baseUrl = 'https://grayscale.bet';
+
+// let baseUrl = window.location.protocol + '//' + window.location.host
+// console.log(baseUrl,'baseUrl+++')
+
+// // #ifndef H5
+let baseUrl = 'https://grayscale.qcjhehe.com';
+// // #endif
+
 // post请求封装
  function axiosPost(url, data) {
 	return new Promise((resolve, reject) => {

+ 3 - 3
manifest.json

@@ -2,8 +2,8 @@
     "name" : "GRAYSCALE",
     "appid" : "__UNI__F0EBD91",
     "description" : "",
-    "versionName" : "1.1.3",
-    "versionCode" : 113,
+    "versionName" : "1.1.4",
+    "versionCode" : 114,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */
@@ -111,7 +111,7 @@
         "devServer" : {
             "proxy" : {
                 "^/api" : {
-                    "target" : "https://grayscale.bet",
+                    "target" : "https://grayscale.blog",
                     // "target": "http://heyu.frp.liuniu946.com",
                     "changeOrigin" : true,
                     "pathRewrite" : {

+ 507 - 507
pages/index/index.vue

@@ -1,507 +1,507 @@
-<template>
-	<view class="container">
-		<!-- #ifdef APP-PLUS -->
-		<view class="vheight"></view>
-		<!-- #endif -->
-		<view class="flex" style="justify-content: space-between;padding: 20rpx 30rpx;">
-			<image src="../../static/icon/user.png" mode="" style="width: 53rpx;height: 53rpx;"
-				@click="navto('/pages/user/menu')"></image>
-			<!-- <image src="../../static/icon/tz.png" mode="" style="width: 53rpx;height: 53rpx;"></image> -->
-		</view>
-		<!-- 轮播图 start -->
-		<swiper class="top-swiper" autoplay="true" duration="400" interval="5000" @change="swiperChange">
-			<swiper-item v-for="item in clist" class="carousel-item" @click="bannerNavToUrl(item)">
-				<image :src="item" />
-			</swiper-item>
-		</swiper>
-		<!-- 轮播图 end -->
-		<!-- 通告欄 start -->
-		<u-notice-bar type="none" :more-icon="true" mode="vertical" :list="list" @click="goDetail"
-			@getMore="navto('/pages/index/gglist')"></u-notice-bar>
-		<!-- 通告欄 end -->
-		<!-- 功能盒 start -->
-		<view class="gnh-wrap">
-			<view class="gnh-top flex">
-				<!-- <view class="top-item flex" @click="navto('/pages/index/rg')"> -->
-				<view class="top-item flex" @click="jqqd()">
-					<image src="../../static/icon/gn-1.png" mode="" class=""></image>
-					<view class="">{{ $t('index.rg') }}</view>
-				</view>
-				<view class="top-item flex" @click="navto('/pages/transaction/cblist')">
-					<image src="../../static/icon/gn-2.png" mode="" class=""></image>
-					<view class="">{{ $t('index.cb') }}</view>
-				</view>
-				<view class="top-item flex" @click="navto('/pages/transaction/tblist')">
-					<image src="../../static/icon/gn-3.png" mode="" class=""></image>
-					<view class="">{{ $t('index.tb') }}</view>
-				</view>
-				<view class="top-item flex" @click="navto('/pages/index/language')">
-					<image src="../../static/icon/gn-4.png" mode="" class=""></image>
-					<view class="">{{ $t('index.yy') }}</view>
-				</view>
-				<view class="top-item flex" @click="navto('/pages/index/kf')">
-					<image src="../../static/icon/gn-5.png" mode="" class=""></image>
-					<view class="">{{ $t('index.kf') }}</view>
-				</view>
-			</view>
-			<view class="gnh-btm flex">
-				<view class="btm-item" @click="navto('/pages/transaction/transactionDetail?type=BTC-USDT')">
-					<view class="btm-item-name">BTC/USDT</view>
-					<template v-if="listOBj['BTC-USDT']">
-						<view class="btm-item-val"
-							:style="{ color: listOBj['BTC-USDT'].dcf > 0 ? '#5ec886' : '#DD3745' }">
-							{{ listOBj['BTC-USDT'].last || '--,--' }}
-						</view>
-						<view class="btm-item-bl"
-							:style="{ color: listOBj['BTC-USDT'].dcf > 0 ? '#5ec886' : '#DD3745' }">
-							{{ listOBj['BTC-USDT'].dcf || '--,--' }}%
-						</view>
-					</template>
-				</view>
-				<view class="btm-item" @click="navto('/pages/transaction/transactionDetail?type=BCH-USDT')">
-					<view class="btm-item-name">BCH/USDT</view>
-					<template v-if="listOBj['BCH-USDT']">
-						<view class="btm-item-val"
-							:style="{ color: listOBj['BCH-USDT'].dcf > 0 ? '#5ec886' : '#DD3745' }">
-							{{ listOBj['BCH-USDT'].last || '--,--' }}
-						</view>
-						<view class="btm-item-bl"
-							:style="{ color: listOBj['BCH-USDT'].dcf > 0 ? '#5ec886' : '#DD3745' }">
-							{{ listOBj['BCH-USDT'].dcf || '--,--' }}%
-						</view>
-					</template>
-				</view>
-				<view class="btm-item" @click="navto('/pages/transaction/transactionDetail?type=GCB-USDT')">
-					<view class="btm-item-name">GCB/USDT</view>
-					<template v-if="listOBj['GCB-USDT']">
-						<view class="btm-item-val"
-							:style="{ color: listOBj['GCB-USDT'].dcf > 0 ? '#5ec886' : '#DD3745' }">
-							{{ listOBj['GCB-USDT'].last || '--,--' }}
-						</view>
-						<view class="btm-item-bl"
-							:style="{ color: listOBj['GCB-USDT'].dcf > 0 ? '#5ec886' : '#DD3745' }">
-							{{ listOBj['GCB-USDT'].dcf || '--,--' }}%
-						</view>
-					</template>
-				</view>
-				<view class="btm-item" @click="navto('/pages/transaction/transactionDetail?type=ETH-USDT')">
-					<view class="btm-item-name">ETH/USDT</view>
-					<template v-if="listOBj['ETH-USDT']">
-						<view class="btm-item-val"
-							:style="{ color: listOBj['ETH-USDT'].dcf > 0 ? '#5ec886' : '#DD3745' }">
-							{{ listOBj['ETH-USDT'].last || '--,--' }}
-						</view>
-						<view class="btm-item-bl"
-							:style="{ color: listOBj['ETH-USDT'].dcf > 0 ? '#5ec886' : '#DD3745' }">
-							{{ listOBj['ETH-USDT'].dcf || '--,--' }}%
-						</view>
-					</template>
-				</view>
-			</view>
-		</view>
-		<view class="list">
-			<view class="list-title flex">
-				<view class="title-left">{{ $t('index.jyd') }}</view>
-				<view class="title-center">{{ $t('index.zxjg') }}</view>
-				<view class="title-right">{{ $t('index.zd') }}</view>
-			</view>
-			<view class="list-main flex" @click="navto('/pages/transaction/transactionDetail?type=' + index)"
-				v-for="(item, index) in listOBj">
-				<view class="main-left">{{ item.name }}</view>
-				<view class="main-center" :class="{ down: item.dcf > 0, ping: item.dcf == 0 }">
-					{{ item.last == 0 ? '--.--' : item.last }}
-				</view>
-				<view class="main-right">
-					<view class="btn" :class="{ down: item.dcf > 0, ping: item.dcf == 0 }">{{ item.dcf }}%</view>
-				</view>
-			</view>
-		</view>
-		
-	</view>
-</template>
-
-<script>
-	import {
-		tradelist,
-		gcb,
-		version
-	} from '@/api/login.js';
-	import {
-		saveUrl,
-		interceptor
-	} from '@/utils/loginUtils.js';
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	import {
-		scoketNew,
-		scoketOpen
-	} from '@/utils/socket.js';
-	import {
-		geLevertade,
-		gglist
-	} from '@/api/index.js';
-	export default {
-		data() {
-			return {
-				timer: '',
-				clist: {},
-				scoket: '',
-				instId: 'IOTA-USDT', //请求的产品id
-				spList: [], //需要查询的列表
-				list: [],
-				listInfo: [],
-				listOBj: {
-					'BTC-USDT': {},
-					'ETH-USDT': {}
-				} //保存实际列表对象
-			};
-		},
-		computed: {
-			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
-		},
-		onLoad: function(option) {
-			if (this.timer) {
-				clearTimeout(this.timer);
-				this.timer = null;
-			}
-			uni.setNavigationBarTitle({
-				title: this.$t('index.sy')
-			});
-		},
-		onShow: function() {
-			this.geLevertade();
-			this.tradelist();
-			this.getgg();
-			this.gcb()
-			this.ww()
-		},
-		onHide() {
-			this.closeScoket();
-			clearTimeout(this.timer);
-		},
-		onUnload() {
-			clearTimeout(this.timer);
-		},
-		//下拉刷新
-		onPullDownRefresh() {},
-		methods: {
-			navto(url) {
-				console.log(url);
-				if (!this.hasLogin) {
-					// 保存地址
-					saveUrl();
-					// 登录拦截
-					interceptor();
-				} else {
-					uni.navigateTo({
-						url
-					});
-				}
-			},
-			gcb() {
-				let that = this
-				gcb().then(res => {
-					console.log(res)
-					let data = res.data
-					that.listOBj[data.name] = data
-					that.listOBj[data.name].dcf = (((data.last * 1 - data.sodUtc0 * 1) / (data.sodUtc0 * 1)) * 100)
-						.toFixed(2);
-					that.listOBj[data.name].name = data.name.replace('-', '/')
-					console.log(that.listOBj, 'that.listOBj')
-					if (that.timer) {
-						clearTimeout(that.timer)
-						that.timer = null
-					}
-					that.timer = setTimeout(() => {
-						that.gcb()
-					},5000)
-				})
-			},
-			jqqd() {
-				this.$api.msg(this.$t('zxt.jqqd'));
-			},
-			goDetail(e) {
-				uni.navigateTo({
-					url: '/pages/index/ggDetail?id=' + this.listInfo[e].id
-				});
-			},
-			getgg() {
-				const obj = this;
-				gglist({
-					page: 1,
-					limit: 1000
-				}).then(e => {
-					obj.listInfo = e.data;
-					e.data.forEach(e => {
-						obj.list.push(e.title);
-					});
-				});
-			},
-			swiperChange() {},
-			// 开始请求长连接
-			onScoket() {
-				const that = this;
-				that.scoket = scoketNew('wss://wsaws.okx.com:8443/ws/v5/public');
-				that.scoket.scoketOpen().then(res => {
-					const requestList = that.spList.map(e => {
-						return {
-							channel: 'tickers',
-							instId: e.coinname.toUpperCase() + '-USDT'
-						};
-					});
-					that.scoket
-						.scoketSend({
-							op: 'subscribe',
-							args: requestList
-						})
-						.then(res => {
-							console.log(res, '发送成功');
-						});
-					that.scoket.scoketMessage(res => {
-						try {
-							if (res.data) {
-								// console.log(res.data, '123456');
-								that.listOBj[res.arg.instId] = res.data[0];
-								const item = that.listOBj[res.arg.instId];
-								item.dcf = (((item.last * 1 - item.sodUtc0 * 1) / (item.sodUtc0 * 1)) *
-									100).toFixed(2);
-								item.name = item.instId.replace('-', '/');
-								// res.res.data[0].name = res.arg.instId
-								// that.listOBj[res.arg.instId] = res.data[0];
-								// that.listOBj[res.arg.instId].dcf = (((res.data[0].last * 1 - res.data[0].sodUtc0 * 1) / (res.data[0].sodUtc0 * 1)) * 100).toFixed(2);
-								that.listOBj = Object.assign({}, that.listOBj);
-							}
-							// console.log(that.listOBj, 'that.listOBj++++++');
-						} catch (e) {
-							console.log(res, res.data, '报错');
-						}
-					});
-				});
-			},
-			closeScoket() {
-				this.scoket.scoketClose();
-			},
-			// 获取查询列表
-			geLevertade() {
-				const that = this;
-				geLevertade().then(e => {
-					that.spList = e.list;
-					// 开启长连接
-					that.onScoket();
-				});
-			},
-			// 轮播图跳转
-			bannerNavToUrl(item) {
-				// #ifdef H5
-				console.log(item.wap_url.indexOf('http'), 'banner');
-				if (item.wap_url.indexOf('http') >= 0) {
-					window.location.href = item.wap_url;
-				}
-				// #endif
-				//测试数据没有写id,用title代替
-				uni.navigateTo({
-					url: item.wap_url
-				});
-			},
-			tradelist() {
-				tradelist().then(res => {
-					console.log(res);
-					this.clist = res.data.clist;
-					this.clist = Object.assign({}, this.clist);
-					console.log(this.clist, 'this.clist');
-				});
-			},
-			down() {
-				version().then(res => {
-					console.log(res)
-					window.open(res.data.app)
-				})
-				
-			},
-			ww() {
-				
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	// 顶部轮播图
-	.top-swiper {
-		margin: auto;
-		width: 726rpx;
-		height: 273rpx;
-
-		.carousel-item {}
-
-		// margin: 20rpx 0 0;
-		image {
-			// margin: auto;
-			width: 726rpx;
-			height: 273rpx;
-		}
-	}
-
-	.gnh-wrap {
-		margin: 20rpx 0;
-		width: 750rpx;
-		min-height: 315rpx;
-		padding-bottom: 20rpx;
-		background-color: #fff;
-		border-radius: 50rpx 50rpx 0 0;
-
-		.gnh-top {
-			justify-content: space-around;
-			height: 156rpx;
-
-			.top-item {
-				flex-direction: column;
-				justify-content: center;
-				align-items: center;
-
-				image {
-					width: 66rpx;
-					height: 75rpx;
-				}
-
-				view {
-					font-weight: 500;
-					color: #525c6e;
-				}
-			}
-		}
-
-		.gnh-btm {
-			justify-content: space-around;
-
-			.btm-item {
-				width: 33%;
-				text-align: center;
-				padding-top: 20rpx;
-
-				.btm-item-name {
-					font-size: 24rpx;
-					font-weight: 500;
-					color: #525c6e;
-				}
-
-				.btm-item-val {
-					font-size: 26rpx;
-					font-weight: 500;
-					color: #dd3745;
-					padding: 20rpx 0;
-				}
-
-				.btm-item-bl {
-					font-size: 24rpx;
-					font-weight: 500;
-					color: #dd3745;
-				}
-			}
-		}
-	}
-
-	.list {
-		background: #ffffff;
-		border-top-left-radius: 26rpx;
-		border-top-right-radius: 26rpx;
-		padding: 40rpx 15rpx 0;
-
-		.list-title {
-			font-size: 28rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #525c6e;
-			padding-bottom: 32rpx;
-
-			.title-left {
-				text-align: left;
-				width: 33%;
-			}
-
-			.title-center {
-				text-align: center;
-				width: 33%;
-			}
-
-			.title-right {
-				text-align: right;
-				width: 33%;
-			}
-		}
-
-		.list-main {
-			padding: 12rpx 0;
-
-			.main-left {
-				text-align: left;
-				width: 33%;
-				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #525c6e;
-			}
-
-			.main-center {
-				text-align: center;
-				width: 33%;
-				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #e15560;
-
-				&.down {
-					color: #5ec886;
-				}
-
-				&.ping {
-					color: #525c6e;
-				}
-			}
-
-			.main-right {
-				text-align: right;
-				width: 33%;
-				display: flex;
-				justify-content: flex-end;
-
-				.btn {
-					width: 122rpx;
-					height: 63rpx;
-					background: #e15562;
-					border-radius: 5rpx;
-					text-align: center;
-					line-height: 63rpx;
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #ffffff;
-
-					&.down {
-						background: #5ec886;
-					}
-
-					&.ping {
-						background: #f6f6f6;
-					}
-				}
-			}
-		}
-	}
-
-	.vheight {
-		height: var(--status-bar-height);
-	}
-	.wwdown {
-		// padding: 20rpx;
-		image {
-			width: 750rpx;
-		}
-		margin-bottom: 20rpx;
-		font-size: 24rpx;
-		text-align: right;
-		color: #525c6e;
-	}
-</style>
+<template>
+	<view class="container">
+		<!-- #ifdef APP-PLUS -->
+		<view class="vheight"></view>
+		<!-- #endif -->
+		<view class="flex" style="justify-content: space-between;padding: 20rpx 30rpx;">
+			<image src="../../static/icon/user.png" mode="" style="width: 53rpx;height: 53rpx;"
+				@click="navto('/pages/user/menu')"></image>
+			<!-- <image src="../../static/icon/tz.png" mode="" style="width: 53rpx;height: 53rpx;"></image> -->
+		</view>
+		<!-- 轮播图 start -->
+		<swiper class="top-swiper" autoplay="true" duration="400" interval="5000" @change="swiperChange">
+			<swiper-item v-for="item in clist" class="carousel-item" @click="bannerNavToUrl(item)">
+				<image :src="item" />
+			</swiper-item>
+		</swiper>
+		<!-- 轮播图 end -->
+		<!-- 通告欄 start -->
+		<u-notice-bar type="none" :more-icon="true" mode="vertical" :list="list" @click="goDetail"
+			@getMore="navto('/pages/index/gglist')"></u-notice-bar>
+		<!-- 通告欄 end -->
+		<!-- 功能盒 start -->
+		<view class="gnh-wrap">
+			<view class="gnh-top flex">
+				<!-- <view class="top-item flex" @click="navto('/pages/index/rg')"> -->
+				<view class="top-item flex" @click="jqqd()">
+					<image src="../../static/icon/gn-1.png" mode="" class=""></image>
+					<view class="">{{ $t('index.rg') }}</view>
+				</view>
+				<view class="top-item flex" @click="navto('/pages/transaction/cblist')">
+					<image src="../../static/icon/gn-2.png" mode="" class=""></image>
+					<view class="">{{ $t('index.cb') }}</view>
+				</view>
+				<view class="top-item flex" @click="navto('/pages/transaction/tblist')">
+					<image src="../../static/icon/gn-3.png" mode="" class=""></image>
+					<view class="">{{ $t('index.tb') }}</view>
+				</view>
+				<view class="top-item flex" @click="navto('/pages/index/language')">
+					<image src="../../static/icon/gn-4.png" mode="" class=""></image>
+					<view class="">{{ $t('index.yy') }}</view>
+				</view>
+				<view class="top-item flex" @click="navto('/pages/index/kf')">
+					<image src="../../static/icon/gn-5.png" mode="" class=""></image>
+					<view class="">{{ $t('index.kf') }}</view>
+				</view>
+			</view>
+			<view class="gnh-btm flex">
+				<view class="btm-item" @click="navto('/pages/transaction/transactionDetail?type=BTC-USDT')">
+					<view class="btm-item-name">BTC/USDT</view>
+					<template v-if="listOBj['BTC-USDT']">
+						<view class="btm-item-val"
+							:style="{ color: listOBj['BTC-USDT'].dcf > 0 ? '#5ec886' : '#DD3745' }">
+							{{ listOBj['BTC-USDT'].last || '--,--' }}
+						</view>
+						<view class="btm-item-bl"
+							:style="{ color: listOBj['BTC-USDT'].dcf > 0 ? '#5ec886' : '#DD3745' }">
+							{{ listOBj['BTC-USDT'].dcf || '--,--' }}%
+						</view>
+					</template>
+				</view>
+				<view class="btm-item" @click="navto('/pages/transaction/transactionDetail?type=BCH-USDT')">
+					<view class="btm-item-name">BCH/USDT</view>
+					<template v-if="listOBj['BCH-USDT']">
+						<view class="btm-item-val"
+							:style="{ color: listOBj['BCH-USDT'].dcf > 0 ? '#5ec886' : '#DD3745' }">
+							{{ listOBj['BCH-USDT'].last || '--,--' }}
+						</view>
+						<view class="btm-item-bl"
+							:style="{ color: listOBj['BCH-USDT'].dcf > 0 ? '#5ec886' : '#DD3745' }">
+							{{ listOBj['BCH-USDT'].dcf || '--,--' }}%
+						</view>
+					</template>
+				</view>
+				<view class="btm-item" @click="navto('/pages/transaction/transactionDetail?type=GCB-USDT')">
+					<view class="btm-item-name">GCB/USDT</view>
+					<template v-if="listOBj['GCB-USDT']">
+						<view class="btm-item-val"
+							:style="{ color: listOBj['GCB-USDT'].dcf > 0 ? '#5ec886' : '#DD3745' }">
+							{{ listOBj['GCB-USDT'].last || '--,--' }}
+						</view>
+						<view class="btm-item-bl"
+							:style="{ color: listOBj['GCB-USDT'].dcf > 0 ? '#5ec886' : '#DD3745' }">
+							{{ listOBj['GCB-USDT'].dcf || '--,--' }}%
+						</view>
+					</template>
+				</view>
+				<view class="btm-item" @click="navto('/pages/transaction/transactionDetail?type=ETH-USDT')">
+					<view class="btm-item-name">ETH/USDT</view>
+					<template v-if="listOBj['ETH-USDT']">
+						<view class="btm-item-val"
+							:style="{ color: listOBj['ETH-USDT'].dcf > 0 ? '#5ec886' : '#DD3745' }">
+							{{ listOBj['ETH-USDT'].last || '--,--' }}
+						</view>
+						<view class="btm-item-bl"
+							:style="{ color: listOBj['ETH-USDT'].dcf > 0 ? '#5ec886' : '#DD3745' }">
+							{{ listOBj['ETH-USDT'].dcf || '--,--' }}%
+						</view>
+					</template>
+				</view>
+			</view>
+		</view>
+		<view class="list">
+			<view class="list-title flex">
+				<view class="title-left">{{ $t('index.jyd') }}</view>
+				<view class="title-center">{{ $t('index.zxjg') }}</view>
+				<view class="title-right">{{ $t('index.zd') }}</view>
+			</view>
+			<view class="list-main flex" @click="navto('/pages/transaction/transactionDetail?type=' + index)"
+				v-for="(item, index) in listOBj">
+				<view class="main-left">{{ item.name }}</view>
+				<view class="main-center" :class="{ down: item.dcf > 0, ping: item.dcf == 0 }">
+					{{ item.last == 0 ? '--.--' : item.last }}
+				</view>
+				<view class="main-right">
+					<view class="btn" :class="{ down: item.dcf > 0, ping: item.dcf == 0 }">{{ item.dcf }}%</view>
+				</view>
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	import {
+		tradelist,
+		gcb,
+		version
+	} from '@/api/login.js';
+	import {
+		saveUrl,
+		interceptor
+	} from '@/utils/loginUtils.js';
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import {
+		scoketNew,
+		scoketOpen
+	} from '@/utils/socket.js';
+	import {
+		geLevertade,
+		gglist
+	} from '@/api/index.js';
+	export default {
+		data() {
+			return {
+				timer: '',
+				clist: {},
+				scoket: '',
+				instId: 'IOTA-USDT', //请求的产品id
+				spList: [], //需要查询的列表
+				list: [],
+				listInfo: [],
+				listOBj: {
+					'BTC-USDT': {},
+					'ETH-USDT': {}
+				} //保存实际列表对象
+			};
+		},
+		computed: {
+			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+		},
+		onLoad: function(option) {
+			if (this.timer) {
+				clearTimeout(this.timer);
+				this.timer = null;
+			}
+			uni.setNavigationBarTitle({
+				title: this.$t('index.sy')
+			});
+		},
+		onShow: function() {
+			this.geLevertade();
+			this.tradelist();
+			this.getgg();
+			this.gcb()
+			this.ww()
+		},
+		onHide() {
+			this.closeScoket();
+			clearTimeout(this.timer);
+		},
+		onUnload() {
+			clearTimeout(this.timer);
+		},
+		//下拉刷新
+		onPullDownRefresh() {},
+		methods: {
+			navto(url) {
+				console.log(url);
+				if (!this.hasLogin) {
+					// 保存地址
+					saveUrl();
+					// 登录拦截
+					interceptor();
+				} else {
+					uni.navigateTo({
+						url
+					});
+				}
+			},
+			gcb() {
+				let that = this
+				gcb().then(res => {
+					console.log(res)
+					let data = res.data
+					that.listOBj[data.name] = data
+					that.listOBj[data.name].dcf = (((data.last * 1 - data.sodUtc0 * 1) / (data.sodUtc0 * 1)) * 100)
+						.toFixed(2);
+					that.listOBj[data.name].name = data.name.replace('-', '/')
+					console.log(that.listOBj, 'that.listOBj')
+					if (that.timer) {
+						clearTimeout(that.timer)
+						that.timer = null
+					}
+					that.timer = setTimeout(() => {
+						that.gcb()
+					},5000)
+				})
+			},
+			jqqd() {
+				this.$api.msg(this.$t('zxt.jqqd'));
+			},
+			goDetail(e) {
+				uni.navigateTo({
+					url: '/pages/index/ggDetail?id=' + this.listInfo[e].id
+				});
+			},
+			getgg() {
+				const obj = this;
+				gglist({
+					page: 1,
+					limit: 1000
+				}).then(e => {
+					obj.listInfo = e.data;
+					e.data.forEach(e => {
+						obj.list.push(e.title);
+					});
+				});
+			},
+			swiperChange() {},
+			// 开始请求长连接
+			onScoket() {
+				const that = this;
+				that.scoket = scoketNew('wss://wsaws.okx.com:8443/ws/v5/public');
+				that.scoket.scoketOpen().then(res => {
+					const requestList = that.spList.map(e => {
+						return {
+							channel: 'tickers',
+							instId: e.coinname.toUpperCase() + '-USDT'
+						};
+					});
+					that.scoket
+						.scoketSend({
+							op: 'subscribe',
+							args: requestList
+						})
+						.then(res => {
+							console.log(res, '发送成功');
+						});
+					that.scoket.scoketMessage(res => {
+						try {
+							if (res.data) {
+								// console.log(res.data, '123456');
+								that.listOBj[res.arg.instId] = res.data[0];
+								const item = that.listOBj[res.arg.instId];
+								item.dcf = (((item.last * 1 - item.sodUtc0 * 1) / (item.sodUtc0 * 1)) *
+									100).toFixed(2);
+								item.name = item.instId.replace('-', '/');
+								// res.res.data[0].name = res.arg.instId
+								// that.listOBj[res.arg.instId] = res.data[0];
+								// that.listOBj[res.arg.instId].dcf = (((res.data[0].last * 1 - res.data[0].sodUtc0 * 1) / (res.data[0].sodUtc0 * 1)) * 100).toFixed(2);
+								that.listOBj = Object.assign({}, that.listOBj);
+							}
+							// console.log(that.listOBj, 'that.listOBj++++++');
+						} catch (e) {
+							console.log(res, res.data, '报错');
+						}
+					});
+				});
+			},
+			closeScoket() {
+				this.scoket.scoketClose();
+			},
+			// 获取查询列表
+			geLevertade() {
+				const that = this;
+				geLevertade().then(e => {
+					that.spList = e.list;
+					// 开启长连接
+					that.onScoket();
+				});
+			},
+			// 轮播图跳转
+			bannerNavToUrl(item) {
+				// #ifdef H5
+				console.log(item.wap_url.indexOf('http'), 'banner');
+				if (item.wap_url.indexOf('http') >= 0) {
+					window.location.href = item.wap_url;
+				}
+				// #endif
+				//测试数据没有写id,用title代替
+				uni.navigateTo({
+					url: item.wap_url
+				});
+			},
+			tradelist() {
+				tradelist().then(res => {
+					console.log(res);
+					this.clist = res.data.clist;
+					this.clist = Object.assign({}, this.clist);
+					console.log(this.clist, 'this.clist');
+				});
+			},
+			down() {
+				version().then(res => {
+					console.log(res)
+					window.open(res.data.app)
+				})
+				
+			},
+			ww() {
+				
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	// 顶部轮播图
+	.top-swiper {
+		margin: auto;
+		width: 726rpx;
+		height: 273rpx;
+
+		.carousel-item {}
+
+		// margin: 20rpx 0 0;
+		image {
+			// margin: auto;
+			width: 726rpx;
+			height: 273rpx;
+		}
+	}
+
+	.gnh-wrap {
+		margin: 20rpx 0;
+		width: 750rpx;
+		min-height: 315rpx;
+		padding-bottom: 20rpx;
+		background-color: #fff;
+		border-radius: 50rpx 50rpx 0 0;
+
+		.gnh-top {
+			justify-content: space-around;
+			height: 156rpx;
+
+			.top-item {
+				flex-direction: column;
+				justify-content: center;
+				align-items: center;
+
+				image {
+					width: 66rpx;
+					height: 75rpx;
+				}
+
+				view {
+					font-weight: 500;
+					color: #525c6e;
+				}
+			}
+		}
+
+		.gnh-btm {
+			justify-content: space-around;
+
+			.btm-item {
+				width: 33%;
+				text-align: center;
+				padding-top: 20rpx;
+
+				.btm-item-name {
+					font-size: 24rpx;
+					font-weight: 500;
+					color: #525c6e;
+				}
+
+				.btm-item-val {
+					font-size: 26rpx;
+					font-weight: 500;
+					color: #dd3745;
+					padding: 20rpx 0;
+				}
+
+				.btm-item-bl {
+					font-size: 24rpx;
+					font-weight: 500;
+					color: #dd3745;
+				}
+			}
+		}
+	}
+
+	.list {
+		background: #ffffff;
+		border-top-left-radius: 26rpx;
+		border-top-right-radius: 26rpx;
+		padding: 40rpx 15rpx 0;
+
+		.list-title {
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #525c6e;
+			padding-bottom: 32rpx;
+
+			.title-left {
+				text-align: left;
+				width: 33%;
+			}
+
+			.title-center {
+				text-align: center;
+				width: 33%;
+			}
+
+			.title-right {
+				text-align: right;
+				width: 33%;
+			}
+		}
+
+		.list-main {
+			padding: 12rpx 0;
+
+			.main-left {
+				text-align: left;
+				width: 33%;
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #525c6e;
+			}
+
+			.main-center {
+				text-align: center;
+				width: 33%;
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #e15560;
+
+				&.down {
+					color: #5ec886;
+				}
+
+				&.ping {
+					color: #525c6e;
+				}
+			}
+
+			.main-right {
+				text-align: right;
+				width: 33%;
+				display: flex;
+				justify-content: flex-end;
+
+				.btn {
+					width: 122rpx;
+					height: 63rpx;
+					background: #e15562;
+					border-radius: 5rpx;
+					text-align: center;
+					line-height: 63rpx;
+					font-size: 24rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #ffffff;
+
+					&.down {
+						background: #5ec886;
+					}
+
+					&.ping {
+						background: #f6f6f6;
+					}
+				}
+			}
+		}
+	}
+
+	.vheight {
+		height: var(--status-bar-height);
+	}
+	.wwdown {
+		// padding: 20rpx;
+		image {
+			width: 750rpx;
+		}
+		margin-bottom: 20rpx;
+		font-size: 24rpx;
+		text-align: right;
+		color: #525c6e;
+	}
+</style>

+ 2 - 0
pages/public/forget.vue

@@ -65,6 +65,8 @@ export default {
 			})
 				.then(res => {
 					console.log(res);
+					
+					uni.setStorageSync('gwpsw',obj.lpwd)
 					obj.login();
 				})
 				.catch(err => {});

+ 3 - 0
pages/public/login.vue

@@ -28,6 +28,9 @@ export default {
 		uni.setNavigationBarTitle({ title: this.$t('login.dl') });
 		this.email = uni.getStorageSync('gwname') || ''
 		this.lpwd = uni.getStorageSync('gwpsw') || ''
+		if(this.email && this.lpwd) {
+			// this.gologin()
+		}
 	},
 	methods: {
 		...mapMutations('user', ['login', 'setUserInfo']),

+ 2 - 1
pages/user/respwd.vue

@@ -48,10 +48,11 @@ export default {
 				newpwd: obj.newpwd
 			}).then(res => {
 				uni.showToast({
-					title: this.$t('xgcg'),
+					title: this.$t('mm.xgcg'),
 					duration: 2000,
 					position: 'top'
 				});
+				uni.setStorageSync('gwpsw',obj.newpwd)
 				setTimeout(() => {
 					uni.switchTab({
 						url: '/pages/index/index'

+ 6 - 1
store/index.js

@@ -7,7 +7,9 @@ const store = new Vuex.Store({
 	state: {
 		// baseURL:"http://yrh.liuniu946.com",//'http://eb.shuibo.net',//请求地址配置 
 		// baseURL:'http://heyu.frp.liuniu946.com',//请求地址配置
-		 baseURL:'https://grayscale.bet',//请求地址配置 
+		 // baseURL:'https://grayscale.bet',//请求地址配置 
+		baseURL: 'https://grayscale.qcjhehe.com',
+		// baseURL: '',
 		urlFile:'/index',//项目部署所在文件夹
 		userInfo: {}, //登录信息
 		loginInterceptor:false,//是否打开强制登录
@@ -24,6 +26,9 @@ const store = new Vuex.Store({
 		//保存微信对象
 		setWeiChatObj(state, provider) {
 			state.weichatObj = provider;
+		},
+		setBaseUrl(state, provider) {
+			state.baseURL = provider;
 		}
 	},
 	modules:{

+ 1 - 1
unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>GRAYSCALE</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.5841170f.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.ee7f87c9.js></script><script src=/index/static/js/index.4d3cea0a.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.5841170f.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.4601d665.js></script><script src=/index/static/js/index.471ba125.js></script></body></html>

+ 1 - 1
utils/request.js

@@ -63,7 +63,7 @@ service.interceptors.response(
 // 请求前拦截器
 service.interceptors.request(
 	config => {
-		console.log(config, 'top');
+		// console.log(config, 'top');
 		let token = uni.getStorageSync('token') || '';
 		const langlist = ['zh_tw', 'en'];
 		let lang = store.state.lang || uni.getStorageSync('lang');

+ 1 - 1
utils/socket.js

@@ -158,4 +158,4 @@ export function scoketMessage(fun) {
 // 			console.log('消息发送成功');
 // 		}
 // 	});
-// });
+// });