hwq 1 year ago
parent
commit
377d8b3a77
9 changed files with 868 additions and 352 deletions
  1. 4 4
      api/project.js
  2. 198 199
      manifest.json
  3. 9 8
      pages.json
  4. 538 19
      pages/index/index.vue
  5. 76 85
      pages/index/main.vue
  6. 10 11
      pages/user/grade.vue
  7. 22 15
      pages/user/user.vue
  8. 1 1
      store/index.js
  9. 10 10
      utils/tabbar.js

+ 4 - 4
api/project.js

@@ -10,9 +10,9 @@ export function getproject(data, id) {
 }
 
 // 项目任务详情
-export function misssion(data, id, uid) {
+export function misssion(data, id, uid, pid) {
 	return request({
-		url: '/api/index/misssion/id/' + id + '/user_id/' + uid,
+		url: '/api/index/misssion/id/' + id + '/group_id/' + uid + '/product_id/' + pid,
 		method: 'get',
 		data
 	});
@@ -28,9 +28,9 @@ export function user_list(data) {
 }
 
 // 评分
-export function score(data, id, uid) {
+export function score(data, id, uid, pid) {
 	return request({
-		url: '/api/index/score/id/' + id + '/user_id/' + uid,
+		url: '/api/index/score/id/' + id + '/group_id/' + uid + '/product_id/' + pid,
 		method: 'post',
 		data
 	});

+ 198 - 199
manifest.json

@@ -1,204 +1,203 @@
 {
-	"name": "评分",
-	"appid": "__UNI__F0EBD91",
-	"description": "",
-	"versionName": "1.0.0",
-	"versionCode": 100,
-	"transformPx": false,
-	"app-plus": {
-		/* 5+App特有相关 */
-		"usingComponents": true,
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		"modules": {
-			"Maps": {},
-			"Geolocation": {},
-			"OAuth": {},
-			"Payment": {},
-			"Share": {}
-		},
-		/* 模块配置 */
-		"distribute": {
-			/* 应用发布信息 */
-			"android": {
-				/* android打包配置 */
-				"permissions": [
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.INTERNET\"/>",
-					"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-				],
-				"abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"]
-			},
-			"ios": {
-				"idfa": false,
-				"privacyDescription": {
-					"NSPhotoLibraryUsageDescription": "用于提交审核认证",
-					"NSLocationWhenInUseUsageDescription": "该应用需要持续获取用户地理位置,以便为你进行导航",
-					"NSLocationAlwaysUsageDescription": "该应用需要你的地理位置,以便为你提供当前位置信息",
-					"NSPhotoLibraryAddUsageDescription": "该应用需要读取你的相册,以便为你编辑个人信息",
-					"NSCameraUsageDescription": "该应用需要你的相机,以便你完成信息认证",
-					"NSLocationAlwaysAndWhenInUseUsageDescription": "该应用需要你的地理位置,以便为你提供当前位置信息"
-				},
-				"dSYMs": false
-			},
-			/* ios打包配置 */
-			"sdkConfigs": {
-				"maps": {
-					"amap": {
-						"appkey_ios": "7e8fabcd781f77afbd37eaf98dd54498",
-						"appkey_android": "605c71799909b1b96fbc15dbe161cca0"
-					}
-				},
-				"oauth": {
-					"weixin": {
-						"appid": "wx016c3a0056b79c15",
-						"appsecret": "ab387ea25d15ad1f6d91d72ddc64bf96",
-						"UniversalLinks": "https://www.zjljzn.com/uni-universallinks/__UNI__F0EBD91/"
-					},
-					"apple": {}
-				},
-				"ad": {},
-				"geolocation": {
-					"amap": {
-						"__platform__": ["ios", "android"],
-						"appkey_ios": "7e8fabcd781f77afbd37eaf98dd54498",
-						"appkey_android": "605c71799909b1b96fbc15dbe161cca0"
-					},
-					"system": {
-						"__platform__": ["ios", "android"]
-					}
-				},
-				"payment": {
-					"alipay": {
-						"__platform__": ["ios", "android"]
-					},
-					"weixin": {
-						"__platform__": ["ios", "android"],
-						"appid": "wx016c3a0056b79c15",
-						"UniversalLinks": "https://www.zjljzn.com/uni-universallinks/__UNI__F0EBD91/"
-					}
-				},
-				"push": {},
-				"share": {
-					"weixin": {
-						"appid": "wx016c3a0056b79c15",
-						"UniversalLinks": "https://www.zjljzn.com/uni-universallinks/__UNI__F0EBD91/"
-					}
-				},
-				"statics": {}
-			},
-			"splashscreen": {
-				"androidStyle": "common",
-				"iosStyle": "common",
-				"android": {
-					"hdpi": "unpackage/启动图/安卓/482.9.png",
-					"xhdpi": "unpackage/启动图/安卓/722.9.png",
-					"xxhdpi": "unpackage/启动图/安卓/1082.9.png"
-				},
-				"ios": {
-					"storyboard": "unpackage/启动图/ios/CustomStoryboard.zip"
-				}
-			},
-			"icons": {
-				"android": {
-					"hdpi": "unpackage/res/icons/72x72.png",
-					"xhdpi": "unpackage/res/icons/96x96.png",
-					"xxhdpi": "unpackage/res/icons/144x144.png",
-					"xxxhdpi": "unpackage/res/icons/192x192.png"
-				},
-				"ios": {
-					"appstore": "unpackage/res/icons/1024x1024.png",
-					"ipad": {
-						"app": "unpackage/res/icons/76x76.png",
-						"app@2x": "unpackage/res/icons/152x152.png",
-						"notification": "unpackage/res/icons/20x20.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"proapp@2x": "unpackage/res/icons/167x167.png",
-						"settings": "unpackage/res/icons/29x29.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"spotlight": "unpackage/res/icons/40x40.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png"
-					},
-					"iphone": {
-						"app@2x": "unpackage/res/icons/120x120.png",
-						"app@3x": "unpackage/res/icons/180x180.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"notification@3x": "unpackage/res/icons/60x60.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"settings@3x": "unpackage/res/icons/87x87.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png",
-						"spotlight@3x": "unpackage/res/icons/120x120.png"
-					}
-				}
-			}
-		}
-	},
-	/* SDK配置 */
-	"quickapp": {},
-	/* 快应用特有相关 */
-	"mp-weixin": {
-		/* 小程序特有相关 */
-		"usingComponents": true,
-		"appid": "wx57a473fc2f83f7e5",
-		"setting": {
-			"urlCheck": true,
-			"minified": true
-		},
-		"permission": {},
-		"lazyCodeLoading": "requiredComponents",
-		"requiredBackgroundModes": ["location"]
-	},
-	"h5": {
-		"title": "评分",
-		"domain": "",
-		"router": {
-			"base": "/index/",
-			"mode": "hash"
-		},
-		"devServer": {
-			"proxy": {
-				"/api": {
-					"target": "http://xxpf.frp.liuniu946.com",
-					"changeOrigin": true,
-					"pathRewrite": {
-
-					}
-				}
-			}
-		},
-		// "https" : true
-		"sdkConfigs": {
-			"maps": {
-				"qqmap": {
-					"key": "CPGBZ-AW53P-C2BDJ-VPL5Z-HU5EK-OWB2W"
-				}
-			}
-		}
-	},
-	"_spaceID": "364f3115-6ed2-4e8f-913f-836cbd3f34fa",
-	"vueVersion": "3"
+    "name" : "评分",
+    "appid" : "__UNI__F0EBD91",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : 100,
+    "transformPx" : false,
+    "app-plus" : {
+        /* 5+App特有相关 */
+        "usingComponents" : true,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        "modules" : {
+            "Maps" : {},
+            "Geolocation" : {},
+            "OAuth" : {},
+            "Payment" : {},
+            "Share" : {}
+        },
+        /* 模块配置 */
+        "distribute" : {
+            /* 应用发布信息 */
+            "android" : {
+                /* android打包配置 */
+                "permissions" : [
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
+            },
+            "ios" : {
+                "idfa" : false,
+                "privacyDescription" : {
+                    "NSPhotoLibraryUsageDescription" : "用于提交审核认证",
+                    "NSLocationWhenInUseUsageDescription" : "该应用需要持续获取用户地理位置,以便为你进行导航",
+                    "NSLocationAlwaysUsageDescription" : "该应用需要你的地理位置,以便为你提供当前位置信息",
+                    "NSPhotoLibraryAddUsageDescription" : "该应用需要读取你的相册,以便为你编辑个人信息",
+                    "NSCameraUsageDescription" : "该应用需要你的相机,以便你完成信息认证",
+                    "NSLocationAlwaysAndWhenInUseUsageDescription" : "该应用需要你的地理位置,以便为你提供当前位置信息"
+                },
+                "dSYMs" : false
+            },
+            /* ios打包配置 */
+            "sdkConfigs" : {
+                "maps" : {
+                    "amap" : {
+                        "appkey_ios" : "7e8fabcd781f77afbd37eaf98dd54498",
+                        "appkey_android" : "605c71799909b1b96fbc15dbe161cca0"
+                    }
+                },
+                "oauth" : {
+                    "weixin" : {
+                        "appid" : "wx016c3a0056b79c15",
+                        "appsecret" : "ab387ea25d15ad1f6d91d72ddc64bf96",
+                        "UniversalLinks" : "https://www.zjljzn.com/uni-universallinks/__UNI__F0EBD91/"
+                    },
+                    "apple" : {}
+                },
+                "ad" : {},
+                "geolocation" : {
+                    "amap" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appkey_ios" : "7e8fabcd781f77afbd37eaf98dd54498",
+                        "appkey_android" : "605c71799909b1b96fbc15dbe161cca0"
+                    },
+                    "system" : {
+                        "__platform__" : [ "ios", "android" ]
+                    }
+                },
+                "payment" : {
+                    "alipay" : {
+                        "__platform__" : [ "ios", "android" ]
+                    },
+                    "weixin" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appid" : "wx016c3a0056b79c15",
+                        "UniversalLinks" : "https://www.zjljzn.com/uni-universallinks/__UNI__F0EBD91/"
+                    }
+                },
+                "push" : {},
+                "share" : {
+                    "weixin" : {
+                        "appid" : "wx016c3a0056b79c15",
+                        "UniversalLinks" : "https://www.zjljzn.com/uni-universallinks/__UNI__F0EBD91/"
+                    }
+                },
+                "statics" : {}
+            },
+            "splashscreen" : {
+                "androidStyle" : "common",
+                "iosStyle" : "common",
+                "android" : {
+                    "hdpi" : "unpackage/启动图/安卓/482.9.png",
+                    "xhdpi" : "unpackage/启动图/安卓/722.9.png",
+                    "xxhdpi" : "unpackage/启动图/安卓/1082.9.png"
+                },
+                "ios" : {
+                    "storyboard" : "unpackage/启动图/ios/CustomStoryboard.zip"
+                }
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
+            }
+        }
+    },
+    /* SDK配置 */
+    "quickapp" : {},
+    /* 快应用特有相关 */
+    "mp-weixin" : {
+        /* 小程序特有相关 */
+        "usingComponents" : true,
+        "appid" : "wx57a473fc2f83f7e5",
+        "setting" : {
+            "urlCheck" : true,
+            "minified" : true
+        },
+        "permission" : {},
+        "lazyCodeLoading" : "requiredComponents",
+        "requiredBackgroundModes" : [ "location" ]
+    },
+    "h5" : {
+        "title" : "评分",
+        "domain" : "",
+        "router" : {
+            "base" : "/index/",
+            "mode" : "hash"
+        },
+        "devServer" : {
+            "proxy" : {
+                "/api" : {
+                    "target" : "http://xxpf.frp.liuniu946.com",
+                    "changeOrigin" : true,
+                    "pathRewrite" : {}
+                }
+            }
+        },
+        // "https" : true
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : "CPGBZ-AW53P-C2BDJ-VPL5Z-HU5EK-OWB2W"
+                }
+            }
+        }
+    },
+    "_spaceID" : "364f3115-6ed2-4e8f-913f-836cbd3f34fa",
+    "vueVersion" : "3"
 }
 //xxpf.frp.liuniu946.com/api
 //请求的目标域名
 // "target": "http://lingjie.frp.liuniu946.com", //请求的目标域名
-// "secure": false,
+// "secure": false,
+

+ 9 - 8
pages.json

@@ -62,25 +62,26 @@
 	},
 	"tabBar": {
 		"color": "#C0C4CC",
-		"selectedColor": "#5DBC7C",
+		"selectedColor": "#323C5B",
 		"borderStyle": "black",
 		"backgroundColor": "#ffffff",
 		"list": [{
 				"pagePath": "pages/index/index",
-				"iconPath": "static/tabBar/tab-home.png",
-				"selectedIconPath": "static/tabBar/tab-home-current.png",
+				"iconPath": "static/tabbar/tab-home.png",
+				"selectedIconPath": "static/tabbar/tab-home-current.png",
 				"text": "首页"
 			},
 			{
 				"pagePath": "pages/user/grade",
-				"iconPath": "static/tabBar/tab-my.png",
-				"selectedIconPath": "static/tabBar/tab-my-current.png",
-				"text": "我的成绩"
+				"iconPath": "static/tabbar/tab-grade.png",
+				"selectedIconPath": "static/tabbar/tab-my-current.png",
+				"text": "我的成绩",
+				"visible": false
 			},
 			{
 				"pagePath": "pages/user/user",
-				"iconPath": "static/tabBar/tab-my.png",
-				"selectedIconPath": "static/tabBar/tab-my-current.png",
+				"iconPath": "static/tabbar/tab-my.png",
+				"selectedIconPath": "static/tabbar/tab-my-current.png",
 				"text": "我的"
 			}
 		]

+ 538 - 19
pages/index/index.vue

@@ -1,7 +1,8 @@
 <template>
 	<view class="content">
-		<view class="list-box">
-			<view class="list-item" v-for="(item,index) in list" @click="navTo('/pages/index/main?id='+item.id)">
+		<view class="list-box" v-if="userInfo.user_type==2">
+			<view class="list-item" v-for="(item,index) in list"
+				@click="navTo('/pages/index/main?id='+item.id+'&pid='+project_id)">
 				<view class="list-bg">
 					<image :src="baseURL + item.backgroundimage" mode=""></image>
 				</view>
@@ -11,8 +12,92 @@
 				</view>
 			</view>
 		</view>
-		<m-tabbar v-if="userInfo.user_type==2" fixed fill current="0" :tabbar="tabbar"></m-tabbar>
-		<m-tabbar fixed fill v-if="userInfo.user_type!=2" current="0" :tabbar="tabbar1"></m-tabbar>
+		<view v-else>
+			<view class="top">
+				<view class="top-bg">
+					<image src="../../static/img/top.png" mode=""></image>
+				</view>
+				<view class="top-box">
+					<view class="top-item" v-for="(item,index) in list" @click="tabClick(index)">
+						<view class="top-main">
+							<image v-if="tabCurrentIndex == index" class="top-icon" :src="baseURL + item.iconimage"
+								mode="">
+							</image>
+							<image v-if="tabCurrentIndex != index" class="top-icon" :src="baseURL + item.icon2image"
+								mode="">
+							</image>
+							<view class="top-name" :class="{curret:tabCurrentIndex==index}">
+								{{item.name}}
+							</view>
+						</view>
+						<image class="jt" v-if="index != list.length -1" src="../../static/img/jt.png" mode=""></image>
+					</view>
+				</view>
+				<swiper :current="tabCurrentIndex" :style="{ height: height }" class="swiper-box" duration="300"
+					@change="changeTab">
+					<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in list" :key="tabIndex">
+						<scroll-view scroll-y="true" style="height: 100%;">
+							<view class="student-box flex">
+								<view class="student-left">
+									<view class="shu">
+									</view>
+									<view class="student-name">
+										组: <text>{{dquser.group}}</text>
+									</view>
+								</view>
+								<view class="student-right" @click="qh()">
+									<view class="student-qh">
+										切换
+									</view>
+									<image class="student-back" src="../../static/icon/back.png" mode=""></image>
+								</view>
+							</view>
+							<view class="step" v-for="(item,index) in tabItem.item" :key="index">
+								<view class="step-top">
+									<view class="shu"></view>
+									<view class="step-title">{{item.name}}</view>
+								</view>
+								<view class="step-main  flex">
+									<view class="step-left">分数(共{{item.max_score}}分)</view>
+									<view class="step-right">
+										<input class="step-input" type="digit" v-model="item.score"
+											:max="item.max_score*1" placeholder-class="place" placeholder="请输入分数">
+										<view class="step-font">分</view>
+									</view>
+								</view>
+								<view class="step-info" v-if="item.info">
+									<view class="set-info-title">说明:</view>
+									<view class="set-info-mian">{{item.info}}</view>
+								</view>
+							</view>
+							<view class="btn" @click="tj(tabItem)">
+								确认提交
+							</view>
+							<view style="height:50px;">
+
+							</view>
+						</scroll-view>
+					</swiper-item>
+				</swiper>
+			</view>
+			<uni-popup ref="student" type="bottom">
+				<view class="popup-box">
+					<view class="popup-title flex">
+						<view class="qx" @click="cancel">取消</view>
+						<view class="qd" @click="cancel">确定</view>
+					</view>
+					<view class="popup">
+						<scroll-view class="popup-right" scroll-y="true">
+							<view v-for="(item,index) in userlist" :key="index" class="popup-right-item"
+								:class="{currRight:item.id==dquser.id}" @click="changepeople(item,index)">
+								{{item.group}}
+							</view>
+							<view class="bottom" style="height: 50px"></view>
+						</scroll-view>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
 	</view>
 </template>
 
@@ -22,23 +107,24 @@
 		mapMutations
 	} from 'vuex';
 	import * as mTabbar from '@/components/m-tabbar/m-tabbar.vue'
-	import {
-		reactive
-	} from 'vue'
-	import {
-		tabbar,
-		tabbar1
-	} from '@/utils/tabbar.js';
 	import {
 		getproject,
-		new_project
+		new_project,
+		misssion,
+		user_list,
+		score
 	} from '@/api/project.js'
 	export default {
 		data() {
 			return {
-				tabbar: tabbar,
-				tabbar1: tabbar1,
-				list: []
+				id: '',
+				list: [],
+				userlist: [],
+				height: '',
+				dquser: '',
+				dqdjg: '',
+				tabCurrentIndex: 0,
+				project_id: '',
 			};
 		},
 		computed: {
@@ -47,21 +133,178 @@
 		},
 		onLoad() {},
 		onShow() {
+			if (this.userInfo.user_type != 2) {
+				uni.setTabBarItem({
+					index: 1,
+					"pagePath": "pages/user/grade",
+					"iconPath": "../../static/tabbar/tab-grade.png",
+					"selectedIconPath": "../../static/tabbar/tab-grade-current.png",
+					"text": "我的成绩",
+					"visible": true
+				});
+			} else {
+				uni.setTabBarItem({
+					index: 1,
+					"pagePath": "pages/user/grade",
+					"iconPath": "../../static/tabbar/tab-grade.png",
+					"selectedIconPath": "../../static/tabbar/tab-grade-current.png",
+					"text": "我的成绩",
+					"visible": false
+				});
+			}
+
 			this.loadData()
 		},
 		onReachBottom() {},
-		onReady() {},
+		onReady(res) {
+			var _this = this;
+			uni.getSystemInfo({
+				success: resu => {
+					const query = uni.createSelectorQuery();
+					query.select('.swiper-box').boundingClientRect();
+					query.exec(function(res) {
+						_this.height = resu.windowHeight - res[0].top + 'px';
+						console.log('打印页面的剩余高度', _this.height);
+					});
+				},
+				fail: res => {}
+			});
+		},
 		methods: {
 			loadData() {
-				new_project({}).then(({
+				const obj = this
+				new_project({}).then(er => {
+					if (!er.data.new) {
+						this.$api.msg('暂无考试')
+					}
+					getproject({}, er.data.new.id).then(({
+						data
+					}) => {
+						this.project_id = data.id;
+						console.log(data);
+						if (this.userInfo.user_type == 2) {
+							this.list = data.mission
+						} else {
+							data.mission.forEach(e => {
+								misssion({}, e.id, obj.userInfo.group_id, obj.project_id).then(
+									er => {
+										if (er.data.step.length != 0) {
+											obj.id = er.data.id
+											console.log(obj.id);
+											obj.studentpf()
+										}
+									})
+								console.log(e);
+							})
+						}
+					})
+				})
+			},
+			qh() {
+				this.$refs.student.open()
+			},
+			cancel() {
+				this.$refs.student.close()
+			},
+			studentpf() {
+				user_list({}).then(({
 					data
 				}) => {
-					this.list = data.new.mission
+					if (data.length == 0) {
+						return this.$api.msg('暂无组员')
+					}
+					this.dquser = data[0]
+					this.dqdjg = 0
+					this.userlist = data
+					this.getproject()
 				})
 			},
+			changepeople(item, index) {
+				this.dquser = item
+				this.dqdjg = index
+				this.cancel()
+				this.getproject()
+			},
+			//swiper 切换
+			changeTab(e) {
+				this.tabCurrentIndex = e.detail.current;
+			},
+			//顶部tab点击
+			tabClick(index) {
+				this.tabCurrentIndex = index * 1;
+				console.log(index == this.tabCurrentIndex);
+			},
+			getproject() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				misssion({}, this.id, this.dquser.id, this.project_id).then(({
+					data
+				}) => {
+					uni.hideLoading()
+					this.list = data.step
+				})
+			},
+			next() {
+				const obj = this
+				obj.dqdjg++
+				if (obj.dqdjg >= this.userlist.length) {
+					uni.showModal({
+						title: '提示',
+						content: '当前关的全部组已全部评完',
+						success: function(res) {
+							if (res.confirm) {
+								uni.switchTab({
+									url: '/pages/index/index'
+								})
+							} else if (res.cancel) {}
+						}
+					})
+				} else {
+					console.log(obj.dqdjg);
+					obj.$api.msg('当前组已评价,切换到下一个')
+					obj.dquser = obj.userlist[obj.dqdjg]
+					this.tabCurrentIndex = 0
+					this.getproject()
+				}
+			},
+			tj(opt) {
+				const obj = this
+				let isok = 0;
+				try {
+					opt.item.forEach(e => {
+						if (!e.score) {
+							obj.$api.msg('请输入' + e.name + '的分数')
+							isok = 1
+							throw Error()
+						}
+						if (e.score * 1 > e.max_score) {
+							obj.$api.msg(e.name + '的最大分数为' + e.max_score + ',请不要超过这个分数')
+							isok = 1
+							throw Error()
+						}
+						score({
+							score: e.score
+						}, e.id, obj.dquser.id, obj.project_id).then(e => {})
+
+					})
+					if (isok == 1) {
+						throw Error()
+					} else {
+						obj.$api.msg('改组已评价完成')
+						// if (obj.tabCurrentIndex != obj.list.length - 1 && isok == 0) {
+						// 	obj.tabCurrentIndex++
+						// } else {
+						// 	obj.next()
+						// }
+					}
+				} catch (e) {
+					//TODO handle the exception
+				}
+			},
 			navTo(url) {
 				uni.navigateTo({
-					url
+					url,
 				})
 			}
 		}
@@ -113,4 +356,280 @@
 			color: #FFFFFF;
 		}
 	}
+
+	.top {
+		width: 750rpx;
+		height: 300rpx;
+		position: relative;
+
+		.top-bg {
+			width: 750rpx;
+			height: 300rpx;
+			position: absolute;
+			top: 0;
+			left: 0;
+			right: 0;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.top-box {
+			padding-top: 44rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+
+			.top-item {
+				display: flex;
+
+				.top-main {
+					margin: 0 10rpx;
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+
+					.top-icon {
+						width: 80rpx;
+						height: 80rpx;
+						background: #FFFFFF;
+						border-radius: 50%;
+					}
+
+					.top-name {
+						position: relative;
+						z-index: 2;
+						margin-top: 16rpx;
+						font-size: 24rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: rgba(#ffffff, 0.7);
+					}
+
+					.curret {
+						font-weight: bold;
+						color: #2A9CEC;
+						-webkit-text-stroke: 1rpx #FFFFFF;
+						text-stroke: 1rpx #FFFFFF;
+					}
+				}
+
+				.jt {
+					margin-top: 40rpx;
+					width: 38rpx;
+					height: 22rpx;
+				}
+			}
+		}
+	}
+
+	.student-box {
+		margin: 34rpx auto 0;
+		width: 698rpx;
+		background: #FFFFFF;
+		box-shadow: 0px 6rpx 12rpx 1rpx rgba(101, 101, 101, 0.06);
+		border-radius: 28rpx;
+		padding: 28rpx 22rpx;
+
+		.student-left {
+			display: flex;
+			align-items: center;
+
+			.shu {
+				width: 6rpx;
+				height: 30rpx;
+				background: #F9A81B;
+				border-radius: 3rpx;
+			}
+
+			.student-name {
+				margin-left: 16rpx;
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #000000;
+
+				text {
+					color: #40547E;
+				}
+			}
+		}
+
+		.student-right {
+			display: flex;
+			align-items: center;
+
+			.student-qh {
+				font-size: 26rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #666666;
+				margin-right: 10rpx;
+			}
+
+			.student-back {
+				width: 12rpx;
+				height: 23rpx;
+			}
+		}
+	}
+
+	.step {
+		margin: 34rpx auto 0;
+		width: 698rpx;
+		background: #FFFFFF;
+		box-shadow: 0px 6rpx 12rpx 1rpx rgba(101, 101, 101, 0.06);
+		border-radius: 20rpx;
+		padding: 28rpx 22rpx;
+
+		.step-top {
+			display: flex;
+			align-items: center;
+
+			.shu {
+				width: 6rpx;
+				height: 30rpx;
+				background: #F9A81B;
+				border-radius: 3rpx;
+			}
+
+			.step-title {
+				margin-left: 16rpx;
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #000000;
+			}
+		}
+
+		.step-main {
+			padding: 50rpx 20rpx 32rpx;
+			line-height: 1;
+
+			.step-left {
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #666666;
+			}
+
+			.step-right {
+				display: flex;
+				align-items: center;
+
+				.step-input {
+					text-align: right;
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #FF4C4C;
+				}
+
+				.place {
+					line-height: 1;
+					font-size: 28rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #999999;
+				}
+
+				.step-font {
+					margin-left: 10rpx;
+					font-size: 28rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #000000;
+				}
+			}
+		}
+
+		.step-info {
+			margin-right: 20rpx;
+			border-top: 1px solid #ECECEC;
+			padding: 32rpx 20rpx 0;
+			display: flex;
+			align-items: flex-start;
+
+			.set-info-title {
+				width: 80rpx;
+				flex-shrink: 0;
+				margin-right: 10rpx;
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #666666;
+				line-height: 41rpx;
+			}
+
+			.set-info-mian {
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #666666;
+				line-height: 41rpx;
+			}
+		}
+	}
+
+	.btn {
+		margin: 50rpx auto 0;
+		width: 674rpx;
+		height: 88rpx;
+		background: #2A9CEC;
+		border-radius: 20rpx;
+		text-align: center;
+		line-height: 88rpx;
+		font-size: 36rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #FFFFFF;
+	}
+
+	.popup-box {
+		width: 750rpx;
+		background: #FFFFFF;
+		border-top-left-radius: 30rpx;
+		border-top-right-radius: 30rpx;
+
+		.popup-title {
+			padding: 32rpx 38rpx;
+
+			.qx {
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #666666;
+			}
+
+			.qd {
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #2A9CEC;
+			}
+		}
+	}
+
+	.popup {
+		display: flex;
+		align-items: center;
+
+		.popup-right {
+			width: 100%;
+			height: 500rpx;
+			padding: 0 20rpx;
+
+			.popup-right-item {
+				text-align: center;
+				padding: 30rpx 20rpx;
+				border-bottom: 1px solid #f7f7f7;
+			}
+
+			.currRight {
+				color: #2A9CEC;
+			}
+		}
+	}
 </style>

+ 76 - 85
pages/index/main.vue

@@ -5,11 +5,12 @@
 				<image src="../../static/img/top.png" mode=""></image>
 			</view>
 			<view class="top-box">
-				<view class="top-item" v-for="(item,index) in list">
+				<view class="top-item" v-for="(item,index) in list" @click="tabClick(index)">
 					<view class="top-main">
-						<image v-if="tabCurrentIndex >= index" class="top-icon" :src="baseURL + item.iconimage" mode="">
+						<image v-if="tabCurrentIndex == index" class="top-icon" :src="baseURL + item.iconimage" mode="">
 						</image>
-						<image v-if="tabCurrentIndex < index" class="top-icon" :src="baseURL + item.icon2image" mode="">
+						<image v-if="tabCurrentIndex != index" class="top-icon" :src="baseURL + item.icon2image"
+							mode="">
 						</image>
 						<view class="top-name" :class="{curret:tabCurrentIndex==index}">
 							{{item.name}}
@@ -19,44 +20,46 @@
 				</view>
 			</view>
 			<swiper :current="tabCurrentIndex" :style="{ height: height }" class="swiper-box" duration="300"
-				disable-touch>
+				@change="changeTab">
 				<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in list" :key="tabIndex">
-					<view class="student-box flex">
-						<view class="student-left">
-							<view class="shu">
+					<scroll-view scroll-y="true" style="height: 100%;">
+						<view class="student-box flex">
+							<view class="student-left">
+								<view class="shu">
+								</view>
+								<view class="student-name">
+									组: <text>{{dquser.group}}</text>
+								</view>
 							</view>
-							<view class="student-name">
-								学生: <text>{{dquser.nickname}}</text>
+							<view class="student-right" @click="qh()">
+								<view class="student-qh">
+									切换
+								</view>
+								<image class="student-back" src="../../static/icon/back.png" mode=""></image>
 							</view>
 						</view>
-						<view class="student-right" @click="qh()">
-							<view class="student-qh">
-								切换
+						<view class="step" v-for="(item,index) in tabItem.item" :key="index">
+							<view class="step-top">
+								<view class="shu"></view>
+								<view class="step-title">{{item.name}}</view>
 							</view>
-							<image class="student-back" src="../../static/icon/back.png" mode=""></image>
-						</view>
-					</view>
-					<view class="step" v-for="(item,index) in tabItem.item" :key="index">
-						<view class="step-top">
-							<view class="shu"></view>
-							<view class="step-title">{{item.name}}</view>
-						</view>
-						<view class="step-main  flex">
-							<view class="step-left">分数(共{{item.max_score}}分)</view>
-							<view class="step-right">
-								<input class="step-input" type="digit" v-model="item.score" :max="item.max_score*1"
-									placeholder-class="place" placeholder="请输入分数">
-								<view class="step-font">分</view>
+							<view class="step-main  flex">
+								<view class="step-left">分数(共{{item.max_score}}分)</view>
+								<view class="step-right">
+									<input class="step-input" type="digit" v-model="item.score" :max="item.max_score*1"
+										placeholder-class="place" placeholder="请输入分数">
+									<view class="step-font">分</view>
+								</view>
+							</view>
+							<view class="step-info" v-if="item.info">
+								<view class="set-info-title">说明:</view>
+								<view class="set-info-mian">{{item.info}}</view>
 							</view>
 						</view>
-						<view class="step-info" v-if="item.info">
-							<view class="set-info-title">说明:</view>
-							<view class="set-info-mian">{{item.info}}</view>
+						<view class="btn" @click="tj(tabItem)">
+							确认提交
 						</view>
-					</view>
-					<view class="btn" @click="tj(tabItem)">
-						{{tabIndex == (this.list.length -1)?'确认提交' : '下一步'}}
-					</view>
+					</scroll-view>
 				</swiper-item>
 			</swiper>
 		</view>
@@ -67,16 +70,10 @@
 					<view class="qd" @click="cancel">确定</view>
 				</view>
 				<view class="popup">
-					<scroll-view class="popup-left" scroll-y="true">
-						<view class="popup-left-item" v-for="(item,index) in userlist" :key="index"
-							:class="{curr:index==studentIndex}" @click="changezu(index)">
-							{{item.group}}
-						</view>
-					</scroll-view>
 					<scroll-view class="popup-right" scroll-y="true">
-						<view v-for="(item,index) in userlist[studentIndex].users" :key="index" class="popup-right-item"
+						<view v-for="(item,index) in userlist" :key="index" class="popup-right-item"
 							:class="{currRight:item.id==dquser.id}" @click="changepeople(item,index)">
-							{{item.nickname}}
+							{{item.group}}
 						</view>
 					</scroll-view>
 				</view>
@@ -98,6 +95,7 @@
 	export default {
 		data() {
 			return {
+				project_id: '',
 				studentIndex: 0,
 				tabCurrentIndex: 0,
 				dquser: '',
@@ -125,6 +123,7 @@
 		},
 		onLoad(opt) {
 			this.id = opt.id
+			this.project_id = opt.pid
 		},
 		onShow() {
 			this.loadData()
@@ -137,11 +136,13 @@
 		methods: {
 			loadData() {
 				user_list({}).then(e => {
-					console.log(e, '123456');
+					if (e.data.length == 0) {
+						return this.$api.msg('没有要评价的组')
+					}
 					this.userlist = e.data
+					console.log(this.userlist, '123456');
 					this.dqz = 0;
-					this.dqdjg = 0;
-					this.dquser = e.data[0].users[0]
+					this.dquser = e.data[0]
 					this.getproject()
 				})
 			},
@@ -149,7 +150,7 @@
 				uni.showLoading({
 					title: '加载中'
 				})
-				misssion({}, this.id, this.dquser.id).then(({
+				misssion({}, this.id, this.dquser.id, this.project_id).then(({
 					data
 				}) => {
 					uni.hideLoading()
@@ -158,34 +159,11 @@
 			},
 			next() {
 				const obj = this
-				for (var i = this.dqz; i < this.userlist.length; i++) {
-					for (var j = this.dqdjg; j < this.userlist[i].users.length; j++) {
-						if (obj.dquser.id == this.userlist[i].users[j].id) {
-							if (j + 1 < this.userlist[i].users.length) {
-								obj.dqdjg = j + 1
-								break;
-							} else {
-								obj.dqdjg = 0;
-								obj.dqz++
-							}
-						}
-					}
-					if (obj.dqz == this.userlist.length) {
-						break
-					} else {
-						if (this.userlist[obj.dqz].users.length != 0) {
-							break
-						} else {
-							obj.dqz++
-						}
-					}
-
-				}
-				console.log(obj.dqz, obj.dqdjg);
+				obj.dqz++
 				if (obj.dqz >= this.userlist.length) {
 					uni.showModal({
 						title: '提示',
-						content: '当前关的全部学生已全部评完,是否跳回到首页',
+						content: '当前关的全部组已全部评完,是否跳回到首页',
 						success: function(res) {
 							if (res.confirm) {
 								uni.switchTab({
@@ -195,8 +173,9 @@
 						}
 					})
 				} else {
-					obj.$api.msg('当前学生已评价,切换到下一个')
-					obj.dquser = obj.userlist[obj.dqz].users[obj.dqdjg]
+					console.log(obj.dqz);
+					obj.$api.msg('当前组已评价,切换到下一个')
+					obj.dquser = obj.userlist[obj.dqz]
 					this.tabCurrentIndex = 0
 					this.getproject()
 				}
@@ -210,10 +189,17 @@
 			changezu(index) {
 				this.studentIndex = index
 			},
-			changepeople(item, index) {
+			//swiper 切换
+			changeTab(e) {
+				this.tabCurrentIndex = e.detail.current;
+			},
+			//顶部tab点击
+			tabClick(index) {
+				this.tabCurrentIndex = index;
+			},
+			changepeople(item) {
 				this.dquser = item
 				this.dqz = this.studentIndex
-				this.dqdjg = index
 				this.cancel()
 				this.studentIndex = 0
 				this.tabCurrentIndex = 0
@@ -224,7 +210,8 @@
 				let isok = 0;
 				try {
 					opt.item.forEach(e => {
-						if (!e.score) {
+						console.log(e.score);
+						if (e.score === null) {
 							obj.$api.msg('请输入' + e.name + '的分数')
 							isok = 1
 							throw Error()
@@ -234,26 +221,29 @@
 							isok = 1
 							throw Error()
 						}
+						if (e.score * 1 < 0) {
+							obj.$api.msg('评分不能为负数')
+							isok = 1
+							throw Error()
+						}
 						score({
 							score: e.score
-						}, e.id, obj.dquser.id).then(e => {})
+						}, e.id, obj.dquser.id, obj.project_id).then(e => {})
 
 					})
 					if (isok == 1) {
 						throw Error()
 					} else {
-						if (obj.tabCurrentIndex != obj.list.length - 1 && isok == 0) {
-							obj.tabCurrentIndex++
-						} else {
-							obj.next()
-						}
+						obj.$api.msg('改组已评价完成')
+						// if (obj.tabCurrentIndex != obj.list.length - 1 && isok == 0) {
+						// 	obj.tabCurrentIndex++
+						// } else {
+						// 	obj.next()
+						// }
 					}
 				} catch (e) {
 					//TODO handle the exception
 				}
-
-
-
 			}
 		}
 	};
@@ -546,11 +536,12 @@
 		}
 
 		.popup-right {
-			width: 506rpx;
+			width: 100%;
 			height: 500rpx;
 			padding: 0 20rpx;
 
 			.popup-right-item {
+				text-align: center;
 				padding: 30rpx 20rpx;
 				border-bottom: 1px solid #f7f7f7;
 			}

+ 10 - 11
pages/user/grade.vue

@@ -10,7 +10,6 @@
 				</view>
 			</view>
 		</view>
-		<m-tabbar fixed fill current="1" :tabbar="tabbar1"></m-tabbar>
 	</view>
 </template>
 
@@ -19,14 +18,6 @@
 		mapState,
 		mapMutations
 	} from 'vuex';
-	import * as mTabbar from '@/components/m-tabbar/m-tabbar.vue'
-	import {
-		reactive
-	} from 'vue'
-	import {
-		tabbar,
-		tabbar1
-	} from '@/utils/tabbar.js';
 	import {
 		new_project,
 		my_point
@@ -34,8 +25,6 @@
 	export default {
 		data() {
 			return {
-				tabbar: tabbar,
-				tabbar1: tabbar1,
 				list: [],
 			};
 		},
@@ -44,6 +33,16 @@
 		},
 		onLoad() {},
 		onShow() {
+			if (this.userInfo.user_type != 2) {
+				uni.setTabBarItem({
+					index: 1,
+					"pagePath": "pages/user/grade",
+					"iconPath": "../../static/tabbar/tab-grade.png",
+					"selectedIconPath": "../../static/tabbar/tab-grade-current.png",
+					"text": "我的成绩",
+					"visible": true
+				});
+			}
 			this.loadData()
 		},
 		onReachBottom() {},

+ 22 - 15
pages/user/user.vue

@@ -36,8 +36,8 @@
 				<image class="main-jt" src="../../static/icon/user-bk.png" mode=""></image>
 			</view>
 		</view>
-		<m-tabbar v-if="userInfo.user_type==2" fixed fill current="1" :tabbar="tabbar"></m-tabbar>
-		<m-tabbar fixed fill v-if="userInfo.user_type!=2" current="2" :tabbar="tabbar1"></m-tabbar>
+		<!-- <m-tabbar v-if="userInfo.user_type==2" fixed fill current="1" :tabbar="tabbar"></m-tabbar>
+		<m-tabbar fixed fill v-if="userInfo.user_type!=2" current="2" :tabbar="tabbar1"></m-tabbar> -->
 	</view>
 </template>
 
@@ -46,23 +46,12 @@
 		mapState,
 		mapMutations
 	} from 'vuex';
-	import * as mTabbar from '@/components/m-tabbar/m-tabbar.vue'
-	import {
-		reactive
-	} from 'vue'
-	import {
-		tabbar,
-		tabbar1
-	} from '@/utils/tabbar.js';
 	import {
 		logout
 	} from '@/api/login.js'
 	export default {
 		data() {
-			return {
-				tabbar: tabbar,
-				tabbar1: tabbar1,
-			};
+			return {};
 		},
 		computed: {
 			...mapState('user', ['userInfo', 'hasLogin', 'urlFile']),
@@ -71,7 +60,25 @@
 		},
 		onLoad() {},
 		onShow() {
-			console.log(this.userInfo);
+			if (this.userInfo.user_type != 2) {
+				uni.setTabBarItem({
+					index: 1,
+					"pagePath": "pages/user/grade",
+					"iconPath": "../../static/tabbar/tab-grade.png",
+					"selectedIconPath": "../../static/tabbar/tab-grade-current.png",
+					"text": "我的成绩",
+					"visible": true
+				});
+			} else {
+				uni.setTabBarItem({
+					index: 1,
+					"pagePath": "pages/user/grade",
+					"iconPath": "../../static/tabbar/tab-grade.png",
+					"selectedIconPath": "../../static/tabbar/tab-grade-current.png",
+					"text": "我的成绩",
+					"visible": false
+				});
+			}
 		},
 		onReachBottom() {},
 		onReady() {},

+ 1 - 1
store/index.js

@@ -15,7 +15,7 @@ export function createApp() {
 const store = new Vuex.Store({
 	state: {
 		// baseURL:"http://yrh.liuniu946.com",//'http://eb.shuibo.net',//请求地址配置 
-		baseURL: 'http://xxpf.frp.liuniu946.com', //请求地址配置 
+		baseURL: 'http://grade.liuniukj.com', //请求地址配置 
 		// baseURL:'http://dp.frp.shuibo.net',//请求地址配置 
 		urlFile: '/index', //项目部署所在文件夹
 		hasLogin: false,

+ 10 - 10
utils/tabbar.js

@@ -5,13 +5,13 @@ export const tabbar = {
 	backgroundColor: "#ffffff",
 	list: [{
 		pagePath: "/pages/index/index",
-		iconPath: "/static/tabbar/tab-home.png",
-		selectedIconPath: "/static/tabbar/tab-home-current.png",
+		iconPath: "../static/tabbar/tab-home.png",
+		selectedIconPath: "../static/tabbar/tab-home-current.png",
 		text: "在线评价",
 	}, {
 		pagePath: "/pages/user/user",
-		iconPath: "/static/tabbar/tab-my.png",
-		selectedIconPath: "/static/tabbar/tab-my-current.png",
+		iconPath: "../static/tabbar/tab-my.png",
+		selectedIconPath: "../static/tabbar/tab-my-current.png",
 		text: "个人中心"
 	}]
 }
@@ -23,19 +23,19 @@ export const tabbar1 = {
 	backgroundColor: "#ffffff",
 	list: [{
 			pagePath: "/pages/index/index",
-			iconPath: "/static/tabbar/tab-home.png",
-			selectedIconPath: "/static/tabbar/tab-home-current.png",
+			iconPath: "../static/tabbar/tab-home.png",
+			selectedIconPath: "../static/tabbar/tab-home-current.png",
 			text: "在线评价",
 		},
 		{
 			pagePath: "/pages/user/grade",
-			iconPath: "/static/tabbar/tab-grade.png",
-			selectedIconPath: "/static/tabbar/tab-grade-current.png",
+			iconPath: "../static/tabbar/tab-grade.png",
+			selectedIconPath: "../static/tabbar/tab-grade-current.png",
 			text: "我的得分"
 		}, {
 			pagePath: "/pages/user/user",
-			iconPath: "/static/tabbar/tab-my.png",
-			selectedIconPath: "/static/tabbar/tab-my-current.png",
+			iconPath: "../static/tabbar/tab-my.png",
+			selectedIconPath: "../static/tabbar/tab-my-current.png",
 			text: "个人中心"
 		}
 	]