ソースを参照

登录刷token

lianghanqiang 4 年 前
コミット
fd8ea79f41
2 ファイル変更84 行追加69 行削除
  1. 39 68
      assets/http/global.js
  2. 45 1
      package-lock.json

+ 39 - 68
assets/http/global.js

@@ -1,92 +1,63 @@
 let global = {}
 
+// 	global.baseUrl='http://192.168.1.244:1888/api/'
+global.baseUrl='https://ldt.guosen-fumao.cn/api/'
 
-// const application='prod'	
-// const application='dev'
-const application='test'
-
-if (application == 'prod') {
-	//正式环境
-	global.baseUrl = 'https://ldt.guosen-fumao.cn/api/'
-	global.WebSocketUrl='wss://ldt.guosen-fumao.cn/websocket/'
-	global.enabledCrypto = true //是否开启api加密
-	global.enabledDebug=false //是否开启调试模式
-}else if (application == 'dev') {
-	//开发环境
-	global.baseUrl = 'http://192.168.1.168:2366/'
-	global.WebSocketUrl = 'ws://192.168.1.168:2366/websocket/'
-	global.enabledCrypto = true
-	global.enabledDebug= true
-}else if (application == 'test') {
-	//测试环境
-	global.baseUrl = 'http://139.159.240.119:2366/'
-	global.WebSocketUrl = 'ws://139.159.240.119:2366/websocket/'
-	global.enabledCrypto = true
-	global.enabledDebug= true
-}
-
-
-global.tokenUrl = global.baseUrl +
-	'blade-auth/oauth/token?tenantId=000000&password=21232f297a57a5a743894a0e4a801fc3&username=admin'
+// global.baseUrl='http://localhost:2539/'
 
-global.socket_prefix = 'USER:'
+global.WebSocketUrl='wss://ldt.guosen-fumao.cn/websocket/'
 
-global.socket_prefix_SHOP = 'SHOP:'
+global.tokenUrl=global.baseUrl+ '/blade-auth/oauth/token?tenantId=000000&username=admin&password=21232f297a57a5a743894a0e4a801fc3&grant_type=password&scope=all&type=account'
 
-global.cart_prefix = 'cart:'
+global.agenterTypeId='1423464045809364994'
 
-global.platform = {
-	SHOP: "SHOP",
-	MALL: "MALL"
+global.orderType={
+	USER_PAY:'USER_PAY',
+	AGENT_CHARGE:'AGENT_CHARGE',
+	MALL_CHARGE:'MALL_CHARGE'
 }
 
-global.userType = {
-	USER: "普通用户",
-	CHANNEL: "渠道代理",
-	CITY: "城市代理",
-	SHOP: "商户",
-	MALL: "商场",
+global.payStatus={
+	IS_WAIT:'0',
+	IS_PAY:'1',
+	IS_CANCEL:'2'
 }
 
-// global.agenterTypeId='1423464045809364994'
-global.agenterTypeId = 'agent_channel_setting'
-
-global.paymentScene = {
-	SCAN_CODE: 'SCAN_CODE',
-	TRANSFER: 'TRANSFER',
-	PAY_CODE: 'PAY_CODE',
-	MINI_PROGRAM: 'MINI_PROGRAM'
+global.wxParams={
+	APPID:'wx9ad53e8c83ae1a51'
 }
 
-global.paymentType = {
-	YEE_PAY: "YEE_PAY"
-}
-global.orderType = {
-	USER_PAY: 'USER_PAY',
-	AGENT_CHARGE: 'AGENT_CHARGE',
-	MALL_CHARGE: 'MALL_CHARGE'
+global.APPID={
+	nanyue:'wxd78a776416719686',//南粤药业
+	didi:'wxaf35009675aa0b2a',//滴滴出行
 }
 
-global.takeType = {
-	dine_in: '店内堂食',
-	package: '到店自取',
-	delivery: '商家配送'
+//webSocket 收到服务端的信息
+global.socketMessage={
+	payForPaymentCode:'用户通过付款码付款',//商家扫描用户的付款码支付
 }
-global.takeTypeList = ['店内堂食', '到店自取', '商家配送']
 
-global.mustOrder = '必选'
 
-global.payStatus = {
-	IS_WAIT: '待付款',
-	IS_PAY: '付款成功',
-	IS_CANCEL: '取消付款'
+// 用户积分足够够有三种情况,分别是CHANNEL_ENOUGN、CHANNEL_ZERO_RARE_ENOUGH、CHANNEL_NOENOUGH_RARE_ENOUGH
+global.pointPayType={
+	//渠道积分足够支付
+	CHANNEL_ENOUGN:'CHANNEL_ENOUGN',
+	//渠道积分为0,用户余额为0
+	CHANNEL_ZERO_RARE_ZERO:'CHANNEL_ZERO_RARE_ZERO',
+	//渠道积分为0,用户余额够扣
+	CHANNEL_ZERO_RARE_ENOUGH:'CHANNEL_ZERO_RARE_ENOUGH',
+	//渠道积分为0,用户余额不够扣
+	CHANNEL_ZERO_RARE_NOENOUGH:'CHANNEL_ZERO_RARE_NOENOUGH',
+	//渠道积分不为0,用户余额为0
+	CHANNEL_NOENOUGH_RARE_ZERO:'CHANNEL_NOENOUGH_RARE_ZERO',
+	//渠道积分不为0,用户余额足够扣
+	CHANNEL_NOENOUGH_RARE_ENOUGH:'CHANNEL_NOENOUGH_RARE_ENOUGH',
+	//渠道积分不为0,用户余额不够扣
+	CHANNEL_NOENOUGH_RARE_NOENOUGH:'CHANNEL_NOENOUGH_RARE_NOENOUGH'
 }
 
-global.wxParams = {
-	APPID: 'wx9ad53e8c83ae1a51'
-}
 
-global.TRANSFORM_PARAMS = '95963'
+global.TRANSFORM_PARAMS='95963'
 
 
 export default global

+ 45 - 1
package-lock.json

@@ -1,8 +1,52 @@
 {
   "name": "guosen-ldt-client",
   "version": "1.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 2,
   "requires": true,
+  "packages": {
+    "": {
+      "name": "guosen-ldt-client",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "base-64": "^1.0.0",
+        "luch-request": "^3.0.6",
+        "uview-ui": "^1.8.4"
+      },
+      "devDependencies": {
+        "crypto-js": "^4.1.1"
+      }
+    },
+    "node_modules/@dcloudio/types": {
+      "version": "2.5.6",
+      "resolved": "https://registry.nlark.com/@dcloudio/types/download/@dcloudio/types-2.5.6.tgz",
+      "integrity": "sha1-+6kMwEIOEj6rCeiV1brOsLc+uyE="
+    },
+    "node_modules/base-64": {
+      "version": "1.0.0",
+      "resolved": "https://registry.nlark.com/base-64/download/base-64-1.0.0.tgz",
+      "integrity": "sha1-CdDyCE4yo/0IwkdblzeI7uauj0o="
+    },
+    "node_modules/crypto-js": {
+      "version": "4.1.1",
+      "resolved": "https://registry.nlark.com/crypto-js/download/crypto-js-4.1.1.tgz?cache=0&sync_timestamp=1626954954639&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcrypto-js%2Fdownload%2Fcrypto-js-4.1.1.tgz",
+      "integrity": "sha1-nkhbzwNSEEG9hYRHhrg/t2GXNs8=",
+      "dev": true
+    },
+    "node_modules/luch-request": {
+      "version": "3.0.7",
+      "resolved": "https://registry.nlark.com/luch-request/download/luch-request-3.0.7.tgz",
+      "integrity": "sha1-WJT8PT/2JiKwQshJU8EZLM3q+qU=",
+      "dependencies": {
+        "@dcloudio/types": "^2.0.16"
+      }
+    },
+    "node_modules/uview-ui": {
+      "version": "1.8.4",
+      "resolved": "https://registry.npm.taobao.org/uview-ui/download/uview-ui-1.8.4.tgz",
+      "integrity": "sha1-4yu/I3lCHTGQIuMk4ct7U4fTvUQ="
+    }
+  },
   "dependencies": {
     "@dcloudio/types": {
       "version": "2.5.6",