xuhaolan пре 4 година
родитељ
комит
9f29e8b4d1
7 измењених фајлова са 29 додато и 18 уклоњено
  1. 6 9
      manifest.json
  2. 5 2
      pages/index/index.vue
  3. 7 3
      pages/problem/problem.vue
  4. 10 3
      pages/user/about.vue
  5. 1 1
      pages/user/user.vue
  6. BIN
      static/img/banner.png
  7. BIN
      static/img/problemBg.png

+ 6 - 9
manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "培训机构",
-    "appid" : "__UNI__F0EBD91",
+    "appid" : "__UNI__BEC3016",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -27,12 +27,9 @@
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
                     "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>"
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>"
                 ],
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
             },
@@ -48,7 +45,8 @@
                         "appsecret" : "",
                         "UniversalLinks" : ""
                     }
-                }
+                },
+                "ad" : {}
             }
         }
     },
@@ -72,9 +70,8 @@
         },
         "devServer" : {
             "proxy" : {
-                "/api" : {
-					// "target" : "http://js.frp.liuniu946.com/api",
-					
+                "/api" : {
+                    // "target" : "http://js.frp.liuniu946.com/api",
                     "target" : "http://bbd.liuniu946.com/api",
                     // "changeOrigin": true,
                     "pathRewrite" : {

+ 5 - 2
pages/index/index.vue

@@ -43,7 +43,9 @@ export default {
 	data() {
 		return {
 			swiperCurrent: 0,
-			carouselList: [],
+			carouselList: [{
+				pic:'../../static/img/banner.png',
+			}],
 			dataList: []
 		};
 	},
@@ -64,7 +66,8 @@ export default {
 		async loadData() {
 			const obj = this;
 			banner({}).then(e => {
-				obj.carouselList = e.data.banner;
+				obj.carouselList = obj.carouselList.concat(e.data.banner);
+				console.log(obj.carouselList)
 			});
 			category({page:1,limit: 1000},2).then(({data}) => {
 				console.log(data)

+ 7 - 3
pages/problem/problem.vue

@@ -1,6 +1,7 @@
 <template>
 	<view class="center">
-		<view class="bg">
+		<view class="bg">
+			<image src="../../static/img/problemBg.png" mode=""></image>
 			<view class="back" @click="back">
 				<image src="../../static/img/fanhui.png" ></image>
 			</view>
@@ -149,8 +150,11 @@ export default {
 }
 .bg {
 	height: 426rpx;
-	background: #1CC7C7;
-	position: relative;
+	position: relative;
+	image {
+		width: 100%;
+		height: 100%;
+	}
 	.title {
 		position: absolute;
 		top: 204rpx;

+ 10 - 3
pages/user/about.vue

@@ -23,7 +23,7 @@
 		methods:{
 			async loadData(){
 				const obj = this;
-				details({},3).then(({data}) => {
+				details({},5).then(({data}) => {
 					obj.time = data.add_time;
 					obj.content = data.content;
 					obj.image = data.image_input[0];
@@ -72,7 +72,14 @@
 	margin-top: 20rpx;
 	font-size: 32rpx;
 	font-weight: 500;
-	color: #777777;
+	color: #777777;
+	
+}
+ .content {
+	/deep/ image,img,table {
+		width: 100% !important;
+		margin: 10rpx auto !important;
+	}
+	
 }
-
 </style>

+ 1 - 1
pages/user/user.vue

@@ -133,7 +133,7 @@ export default {
 				this.all = data.sum_class;
 				this.leave = data.leave;
 				this.gift = data.give_class;
-				this.achieve = data.sum_class;
+				this.achieve = data.in_class;
 			});
 			getCourse({})
 				.then(e => {

BIN
static/img/banner.png


BIN
static/img/problemBg.png