11-24

manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "合約",
+    "name" : "GRAYSCALE",
     "appid" : "__UNI__F0EBD91",
     "description" : "",
     "versionName" : "1.0.0",
@@ -49,6 +49,41 @@
                         "UniversalLinks" : ""
                     }
                 }
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
+            },
+            "splashscreen" : {
+                "androidStyle" : "default"
             }
         }
     },
@@ -64,7 +99,7 @@
         }
     },
     "h5" : {
-        "title" : "合約",
+        "title" : "GRAYSCALE",
         "domain" : "",
         "router" : {
             "base" : "/index/",
@@ -73,7 +108,7 @@
         "devServer" : {
             "proxy" : {
                 "^/api" : {
-                    "target" : "http://grayscale.bet",
+                    "target" : "https://grayscale.bet",
                     // "target": "http://heyu.frp.liuniu946.com",
                     "changeOrigin" : true,
                     "pathRewrite" : {

pages/heyue/heyue.vue

@@ -205,7 +205,7 @@
 							限價
 						</view>
 						<view class="text">
-							{{item.wt_price}}
+							{{item.price}}
 						</view>
 					</view>
 					<view v-if="item.direction==2" class="tipList">
@@ -431,7 +431,8 @@
 						that.upDataLoding = false;
 						uni.showModal({
 							title: '提示',
-							content: '掛單成功',
+							content: '掛單成功',
+							confirmText: '確認',
 							showCancel: false,
 						});
 					}).catch(() => {
@@ -539,7 +540,8 @@
 				const that = this;
 				uni.showModal({
 					title: '平倉',
-					content: '是否立即平倉，確認後不可修改',
+					content: '是否立即平倉，確認後不可修改',
+					confirmText: '確認',
 					success: res => {
 						if (res.confirm) {
 							uni.showLoading({
@@ -569,7 +571,8 @@
 				const that = this;
 				uni.showModal({
 					title: '撤銷',
-					content: '是否立即撤銷，確認後不可修改',
+					content: '是否立即撤銷，確認後不可修改',
+					confirmText: '確認',
 					success: res => {
 						if (res.confirm) {
 							uni.showLoading({

pages/heyue/tradlist.vue

@@ -202,6 +202,8 @@
 				uni.showModal({
 					title: '平倉',
 					content: '是否立即平倉，確認後不可修改',
+					confirmText: '確認',
+					cancelText: '取消',
 					success: res => {
 						if (res.confirm) {
 							uni.showLoading({
@@ -232,6 +234,7 @@
 				uni.showModal({
 					title: '撤銷',
 					content: '是否立即撤銷，確認後不可修改',
+					confirmText: '確認',
 					success: res => {
 						if (res.confirm) {
 							uni.showLoading({

pages/transaction/transaction.vue

@@ -65,6 +65,7 @@ export default {
 			uni.showModal({
 				title: '提示',
 				content: '您未登錄，是否馬上登錄？',
+				confirmText: '確認',
 				complete(res) {
 					console.log(res);
 					if (res.confirm) {

pages/user/menu.vue

@@ -113,7 +113,8 @@
 				// this.$refs.popup.open();
 				let obj = this;
 				uni.showModal({
-					content: '确定要退出登录么',
+					content: '確認退出登錄？',
+					confirmText: '確認',
 					success: e => {
 						if (e.confirm) {
 							loginout().then(res => {

store/index.js

@@ -7,7 +7,7 @@ const store = new Vuex.Store({
 	state: {
 		// baseURL:"http://yrh.liuniu946.com",//'http://eb.shuibo.net',//请求地址配置 
 		// baseURL:'http://heyu.frp.liuniu946.com',//请求地址配置
-		 baseURL:'http://grayscale.bet',//请求地址配置 
+		 baseURL:'https://grayscale.bet',//请求地址配置 
 		urlFile:'/index',//项目部署所在文件夹
 		userInfo: {}, //登录信息
 		loginInterceptor:false,//是否打开强制登录

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>商城</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.b0707a6a.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.d3a37645.js></script><script src=/index/static/js/index.3b9c0b33.js></script></body></html>
+<!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.b0707a6a.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.d3a37645.js></script><script src=/index/static/js/index.b36ed55a.js></script></body></html>

utils/newRequest.js

@@ -50,7 +50,8 @@ let service = {
 			// #ifdef H5
 
 			if (process.env.NODE_ENV === 'development') {
-				url = requestData.url;
+				url ='/api'+ requestData.url;
+				console.log(url,'url+++')
 				console.log('开发环境')
 			} else {
 				url = service.baseURL + requestData.url;

utils/request.js

@@ -17,8 +17,9 @@ service.interceptors.response(
 					store.commit('user/logout');
 					// 判断是否开启强制登录
 					uni.showModal({
-						title: "登陆",
-						content: '您未登录！是否马上登录？',
+						title: "登錄",
+						content: '您未登錄！是否马上登錄？',
+						confirmText: '確認',
 						success: (e) => {
 							// 判断是否点击确认按钮
 							if (e.confirm) {