Merge branch 'master' of https://gitee.com/he2802/saas_applet

common/request.js

@@ -4,7 +4,7 @@ import store from '@/store/index.js'
 import api from './api.js'
 var num = 1
 
-export const BASE_URL = 'http://192.168.1.222:5055' //接口api  http://42.192.164.187:19005 http://192.168.1.222:5055
+export const BASE_URL = 'http://42.192.164.187:19005' //接口api  http://42.192.164.187:19005 http://192.168.1.222:5055
 
 
 export const BASE_IMG_URL = 'https://file-dev.xyyxt.net/' //图片上传api  'https://file.xyyxt.net/

pages/login/login.vue

@@ -33,7 +33,7 @@
 				</view>
 			</view>
 			
-			<view  class="wxBtn">
+			<view  class="wxBtn" v-if="false">
 				<button type="default"  class="wxloginBtn"></button>
 				<view style="text-align: center;color: #999999;font-size: 24rpx;margin-top: 10rpx;">微信快捷登录</view>
 			</view>

pages2/class/detail.vue

@@ -72,7 +72,7 @@
 				<view class="inputBottom">
 					<view style="width: 10%;"><image src="/static/icon/note3.png" style="width: 39rpx;height: 39rpx;margin:0 29rpx;"></image></view>
 					<view style="width: 73%;height: 88rpx;margin-bottom: 15rpx;">
-						<u-input height="78" fixed="true" :placeholder="placeholder" type="textarea" :custom-style="inputStyle" v-model="noteValue" />
+						<u-input height="78" fixed="true" placeholder="您可以在这里输入笔记内容" type="textarea" :custom-style="inputStyle" v-model="noteValue" />
 					</view>
 					<view style="color: #007AFF;font-size: 30rpx;font-weight: bold;width: 15%;text-align: center;" @click="postNote">提交</view>
 				</view>

pages2/order/index.vue

@@ -31,7 +31,7 @@
 						</view>
 						<view style="display: flex;align-items: center;">
 							<view class="btn2" v-if="item.orderStatus === 0" @click="resumeOrder(item)">继续支付</view>
-							<view class="btn2" v-if="item.orderStatus === -1 || item.orderStatus === -2">重新购买</view>
+							<view class="btn2" v-if="item.orderStatus === -1 || item.orderStatus === -2" >重新购买</view>
 							<view class="btn2" v-if="item.orderStatus === 1 || item.orderStatus === 2">退款</view>
 							<view class="btn1" v-if="item.orderStatus === -1 || item.orderStatus === -2" @click="delOrder(item)">删除订单</view>
 							<view class="btn1" @click="closeOrder(item)" v-if="item.orderStatus === 0">取消订单</view>