请求地址更改

commit/request.js

@@ -1,13 +1,13 @@
 let is = 2
-var baseURL = '' // API访问的地址
+var baseURL = 'http://api.hxxfb.com/gateway/' // API访问的地址
  if(is==1){
-	  baseURL = 'https://test.hebeiyhc.com/gateway/';//测试环境
+	  baseURL = 'http://api.hxxfb.com/gateway/';//测试环境
  }else if(is==2){
 	 // baseURL = 'https://api.hebeiyhc.com/gateway/'; //生产环境
 	 // baseURL = 'https://api.hebeiyhc.com/gateway/'; //生产环境
-	 baseURL = '/gateway/'; //生产环境
+	 baseURL = 'http://api.hxxfb.com/gateway/'; //生产环境
  }else{
-	  baseURL = 'https://pre.hxxfb.com/gateway/'; //预生产环境
+	  baseURL = 'https://api.hxxfb.com/gateway/'; //预生产环境
  }
 let token = ''; // 用户的token
 let volunteerToken = ''; // DES+B64加密

pages/cashier/index.vue

@@ -31,10 +31,10 @@
 						</view>
 					</view>
 					<!-- <view class="cashier-tablin-nie-right" @click="activitecode(merchantCashierShow)" v-if="merchantCashierShow.merchant_level==1"> -->
-					<!-- <view class="cashier-tablin-nie-right" @click="activitecode(merchantCashierShow)">
+					<view class="cashier-tablin-nie-right" @click="activitecode(merchantCashierShow)">
 						<image :src="merchantCashierShow.qrcode_src" mode="widthFix">
 						</image>
-					</view> -->
+					</view>
 				</view>
 			</view>
 		</view>