zpj 11 meses atrás
pai
commit
eb1999c3f3
4 arquivos alterados com 10 adições e 7 exclusões
  1. 2 2
      .env.prod.js
  2. 4 2
      common/js/ajax.js
  3. 2 1
      manifest.json
  4. 2 2
      pages/index/order.vue

+ 2 - 2
.env.prod.js

@@ -1,6 +1,6 @@
 const config = {
-    baseUrl: 'demoapi.jhcs888.com',
-    socketUrl: 'demoapi.jhcs888.com',
+    baseUrl: 'api.jhcs888.com',
+    socketUrl: 'api.jhcs888.com',
     appName:'正式环境',
     projectType:'2',
 }

+ 4 - 2
common/js/ajax.js

@@ -4,7 +4,8 @@ import tools from "./tools";
 let BASE_URL =''
 
 //#ifndef H5
-BASE_URL ='https://demoapi.jhcs888.com/'
+// BASE_URL ='https://demoapi.jhcs888.com/'
+	BASE_URL ='https://api.jhcs888.com/'
 //#endif
 
 export const request = (url, method, data,isFinance = false,show = false) => {
@@ -25,7 +26,8 @@ export const request = (url, method, data,isFinance = false,show = false) => {
 	if(isFinance){
 		BASE_URL = 'https://adopted.jhcs888.com/'
 	}else{
-		BASE_URL ='https://demoapi.jhcs888.com/'
+		// BASE_URL ='https://demoapi.jhcs888.com/'
+		BASE_URL ='https://api.jhcs888.com/'
 	}
   //#endif
   

+ 2 - 1
manifest.json

@@ -77,7 +77,8 @@
             "https" : false,
             "proxy" : {
                 "/cashierApi" : {
-                    "target" : "https://demoapi.jhcs888.com/",
+					"target" : "https://api.jhcs888.com/",
+                    // "target" : "https://demoapi.jhcs888.com/",
                     "changeOrigin" : true,
                     "secure" : false,
                     "pathRewrite" : {

+ 2 - 2
pages/index/order.vue

@@ -44,7 +44,7 @@
 				<image src="@/static/img/txm.png" mode=""></image>
 				<view class="fs-30 fc-3 fw-400">手输条码</view>
 			</view>
-			<view v-if="shop_id == 299" class="box-2-shou flex-justify-center align-items-center" @click="openMenber()">
+			<view v-if="shop_id == 128" class="box-2-shou flex-justify-center align-items-center" @click="openMenber()">
 				<image src="@/static/img/huiyuan.png" mode=""></image>
 				<view v-if="!member_id" class="fs-30 fc-3 fw-400">消费股东</view>
 				<view v-else class="fs-30 fc-3 fw-400">更换股东</view>
@@ -374,7 +374,7 @@
 			
 			upData() {
 				this.shop_id = uni.getStorageSync('shop_id')
-				if (this.shop_id == 299) {
+				if (this.shop_id == 128) {
 					projectWriteDiscount({
 						order_money: this.totalPrice,
 						invite_code: this.invite_code,