Merge branch 'master' of http://222.85.201.140:10002/xuyunhui/chain_jje_uniapp

App.vue

@@ -6,30 +6,30 @@
 	export default {
 		onLaunch: function() {
             let that = this;
-            wx.login({
-                success(re) {
-                    that.$api.wxAuthLogin({code:re.code}).then(res=>{
-                        uni.setStorageSync('userInfo',res.data.data.userInfo)
-                        uni.setStorageSync('accessToken',res.data.data.access_token)
-                        uni.setStorageSync('phoneIsBind',res.data.data.phoneIsBind)
-
-                        if (res.data.data.phoneIsBind){
-                            uni.switchTab({
-                                url: '/pages/index/index',
-                            })
-                            // uni.navigateTo({
-                            //     url: '/loginPages/bindAccount/index',
-                            // })
-                        }else {
-                            uni.navigateTo({
-                                url: '/pages/login/login',
-                            })
-                        }
-
-                    })
-
-                },
-            })
+            // wx.login({
+            //     success(re) {
+            //         that.$api.wxAuthLogin({code:re.code}).then(res=>{
+            //             uni.setStorageSync('userInfo',res.data.data.userInfo)
+            //             uni.setStorageSync('accessToken',res.data.data.access_token)
+            //             uni.setStorageSync('phoneIsBind',res.data.data.phoneIsBind)
+            //
+            //             if (res.data.data.phoneIsBind){
+            //                 uni.switchTab({
+            //                     url: '/pages/index/index',
+            //                 })
+            //                 // uni.navigateTo({
+            //                 //     url: '/loginPages/bindAccount/index',
+            //                 // })
+            //             }else {
+            //                 uni.navigateTo({
+            //                     url: '/pages/login/login',
+            //                 })
+            //             }
+            //
+            //         })
+            //
+            //     },
+            // })
 			console.log('App Launch')
 		},
 		onShow: function() {

common/js/env.js

@@ -1,8 +1,8 @@
 "use strict";
 
-// let baseUrl = `https://jje.admin.xinyuekj.com.cn`
+let baseUrl = `https://jje.admin.xinyuekj.com.cn`
 // let baseUrl = `http://127.0.0.1:9000`
-let baseUrl = `http://192.168.1.150:8080`
+// let baseUrl = `http://192.168.1.150:8080`
 
 // 变量可自行添加修改
 export default { //存放变量的容器

main.js

@@ -9,8 +9,8 @@ import api from './common/js/api'
 console.log(`process`, process.envenv)
 
 import uView from "uview-ui";
-// const baseUrl = 'https://jje.admin.xinyuekj.com.cn';
-const baseUrl = 'http://192.168.1.150:8080';
+const baseUrl = 'https://jje.admin.xinyuekj.com.cn';
+// const baseUrl = 'http://192.168.1.150:8080';
 Vue.use(uView);
 Vue.config.productionTip = false
 Vue.prototype.$baseUrl = baseUrl;

myPages/TermsOfService/index.vue

@@ -32,27 +32,12 @@ export default {
       title: option.name
 
     })
-    // this.getTermOfServiceByType(option.type);
     this.type = option.type
     this.AboutByType(this.type)
   },
 
   methods: {
-    // 获取服务条款信息
-    getTermOfServiceByType(type) {
-      // 获取数据
-      this.$api.getTermOfServiceByType({type: type}).then((res) => {
-        if (res.aboutContent) {
-          this.termOfService.aboutContent = res.aboutContent
-        } else {
-          this.termOfService.aboutContent = "暂无信息！！！"
-        }
-      }).catch(() => {
-        uni.showToast({
-          title: "操作失败"
-        })
-      });
-    },
+
     AboutByType(type) {
       this.$api.AboutByType({type:type}).then(res => {
         this.name = res.data.data.aboutContent

pages.json

@@ -3,7 +3,13 @@
 		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
 	},
 	"pages": [
-
+		{
+			"path": "pages/login/login",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		},
 		{
 			"path": "pages/index/index",
 			"style": {
@@ -38,12 +44,6 @@
 				"navigationStyle": "custom",
 				"enablePullDownRefresh": false
 			}
-		},{
-			"path": "pages/login/login",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
 		}
 	],
 	"subPackages": [

pages/login/login.vue

@@ -14,7 +14,7 @@
               微信授权手机号登录
             </button> -->
 
-			<button class="login-btn" @click="authWechatCodeLogin()">
+			<button class="login-btn" @click="wechatCodeLogin()">
 				<u-icon name="weixin-fill" color="green" size="26"></u-icon>
 				授权微信登录
 			</button>
@@ -106,7 +106,7 @@
 			};
 		},
 		onLoad() {
-			this.wechatCodeLogin();
+			// this.wechatCodeLogin();
 		},
 		methods: {
 			// 去协议页面

pages/order/index.vue

@@ -1,6 +1,7 @@
 <template>
 	<view class="content">
 
+		<u-sticky>
 <!--			<view ref="hContentWrap" class="hContentWrap h-content-wrap">-->
 <!--				<view class="tab-bar">-->
 <!--					<view class="tab-item" :class="{ active: currentTab === 0 }" @click="changeTab(0)">-->
@@ -11,16 +12,17 @@
 <!--					</view>-->
 <!--				</view>-->
 <!--			</view>-->
-			<View class=" tabs" v-if="currentTab === 0">
+			<View class=" tabs">
 				<u-tabs :list="tabList" :scrollable="false" lineWidth="30" lineColor="#FFE05C" :activeStyle="{
             					color: '#333333',
             					fontWeight: 'bold',
             					transform: 'scale(1.05)'
        							 }" :current="tabIndex" @click="clickTab"></u-tabs>
 			</View>
+		</u-sticky>
 
 		<!-- 订单列表 -->
-		<view :style="{'height':windowHeight}" v-if="currentTab === 0">
+		<view :style="{'height':windowHeight}">
 			<swiper :style="{'height':windowHeight}" :current="tabIndex" @change="swiperChange">
 				<swiper-item class="swiperItem" v-for="(item,index) in tabList" :key="index">
 					<view>
@@ -32,12 +34,12 @@
 		</view>
 
 
-		<view class="product-order" v-if="currentTab === 1">
-			<!-- Tab 2 内容 -->
-			<view class="developing">
-				<text>敬请期待...</text>
-			</view>
-		</view>
+<!--		<view class="product-order" v-if="currentTab === 1">-->
+<!--			&lt;!&ndash; Tab 2 内容 &ndash;&gt;-->
+<!--			<view class="developing">-->
+<!--				<text>敬请期待...</text>-->
+<!--			</view>-->
+<!--		</view>-->
 
 
 		<uni-popup ref="serialNumber">