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

common/request.js

@@ -3,12 +3,15 @@
 import store from '@/store/index.js'
 import api from './api.js'
 var num = 1
+//接口api   
+// export const BASE_URL = 'https://api.xyyxt.net'   //release
+export const BASE_URL = 'http://42.192.164.187:19005'  //test
+// export const BASE_URL = 'http://192.168.1.222:5055'    //dev
 
-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/
-export const tenantId = '867735392558919680'
+ //图片上传api
+// export const BASE_IMG_URL = 'https://file.xyyxt.net/'     //release
+ export const BASE_IMG_URL = 'https://file-dev.xyyxt.net/'  //test
+export const tenantId = '867735392558919680' 
 export const myRequest = (options) => {
 	if (store.state.allowLoading) {
 		uni.showLoading({

manifest.json

@@ -75,7 +75,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxd0fac11d52c8808b",
+        "appid" : "wxd3c8ae80cf43a305",
         "setting" : {
             "urlCheck" : false,
             "postcss" : true,

pages2/class/detail.vue

@@ -35,7 +35,7 @@
 			</view>
 			<u-line color="#D6D6DB" />
 			<view style="display: flex;justify-content: center;">
-				<view><u-tabs :list="list" font-size="24" :is-scroll="false" bar-width="80" :current="current" @change="change" active-color="#007AFF"></u-tabs></view>
+				<view><u-tabs :list="list" font-size="24" bar-width="80" :current="current" @change="change" active-color="#007AFF"></u-tabs></view>
 			</view>
 			<u-line color="#D6D6DB" />
 		</view>
@@ -189,18 +189,7 @@ export default {
 				padding: '8rpx',
 				marginBottom: '10rpx'
 			},
-			list: [
-				
-				{
-					name: '目录'
-				},
-				{
-					name: '笔记'
-				},
-				{
-					name: '答疑'
-				}
-			],
+			list: [],
 			menuList: [],
 			current: 0,
 			vid: '',
@@ -893,7 +882,33 @@ export default {
 					}
 					self.reMenuList = res.data.rows;
 					if(self.reMenuList.length>0){
-						self.list.push({name:'重修目录'})
+						self.list = [
+							
+							{
+								name: '目录'
+							},
+							{
+								name: '笔记'
+							},
+							{
+								name: '答疑'
+							},{name:'重修目录'}
+						];
+						this.current = 0;
+					} else {
+						self.list = [
+							
+							{
+								name: '目录'
+							},
+							{
+								name: '笔记'
+							},
+							{
+								name: '答疑'
+							}
+						];
+						this.current = 0;
 					}
 				}
 			});

pages2/order/index.vue

@@ -25,7 +25,7 @@
 							</view>
 						</view>
 						<view style="display: flex;flex-direction: row-reverse;padding: 10rpx 0;">
-							<view class="btn2" v-if="item.orderFrom === 2&&(item.orderStatus === 1 || item.orderStatus === 2)&&(items.goodsType == '1' || items.goodsType == '2')" @click.stop="refund(item.orderSn,items.goodsId)">退款</view>
+							<view class="btn2" v-if="items.refundStatus === 0&&item.orderFrom === 2&&(item.orderStatus === 1 || item.orderStatus === 2)&&(items.goodsType == '1' || items.goodsType == '2')" @click.stop="refund(item.orderSn,items.goodsId)">退款</view>
 						</view>
 					</view>
 					<view style="height: 80rpx;display: flex;justify-content: space-between;align-items: center;">
@@ -104,11 +104,10 @@ export default {
 			let self = this
 			this.$api.refundSmallOrder({orderSn:orderSn,goodsId:goodsId}).then(res => {
 				if(res.data.code==200){
-					uni.showModal({
-						title: "提示",
-						content: res.data.msg,
-						showCancel: false
-					})
+					if (res.data.code === 200) {
+						self.$method.showToast('退款成功');
+						self.getOrderList();
+					}
 				}
 			});
 		},
@@ -259,10 +258,10 @@ export default {
 				this.formData.orderStatus = '0';
 			}
 			if (this.current === 1) {
-				this.formData.orderStatus = '1,2';
+				this.formData.orderStatus = '1,2,3';
 			}
 			if (this.current === 2) {
-				this.formData.orderStatus = '-1,-2';
+				this.formData.orderStatus = '-1,-2,4';
 			}
 			this.$api.getorderlists(this.formData).then(res => {
 				if (res.data.code === 200) {

pages2/register/bind.vue

@@ -174,6 +174,8 @@ export default {
 	onLoad(option) {
 		let that = this;
 		this.from = option.from;
+		uni.removeStorageSync('user_account') //移除临时账号
+		uni.removeStorageSync('token')
 		uni.login({
 			provider: 'weixin',
 			success: function(loginRes) {