diff --git a/.env.development b/.env.development index 101171d8..223d9ac2 100644 --- a/.env.development +++ b/.env.development @@ -3,6 +3,6 @@ ENV = 'development' # 'development' # base api -VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786' +# VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786' # 苗扬 # VITE_APP_BASE_API_Url = 'http://25.64.16.133:9786' diff --git a/package-lock.json b/package-lock.json index 9a29ad1b..d9c4d53d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { - "name": "uni-preset-vue", - "version": "0.0.0", + "name": "tra-app", + "version": "0.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "uni-preset-vue", - "version": "0.0.0", + "name": "tra-app", + "version": "0.0.1", "dependencies": { "@dcloudio/uni-app": "3.0.0-4060620250520001", "@dcloudio/uni-app-harmony": "3.0.0-4060620250520001", @@ -24,6 +24,9 @@ "@dcloudio/uni-mp-weixin": "3.0.0-4060620250520001", "@dcloudio/uni-mp-xhs": "3.0.0-4060620250520001", "@dcloudio/uni-quickapp-webview": "3.0.0-4060620250520001", + "crypto-js": "^3.1.9-1", + "terser": "^5.42.0", + "uuid": "^11.1.0", "vue": "^3.4.21", "vue-i18n": "^9.1.9" }, @@ -3654,7 +3657,6 @@ "version": "0.3.6", "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/@jridgewell/source-map/-/source-map-0.3.6.tgz", "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==", - "devOptional": true, "license": "MIT", "dependencies": { "@jridgewell/gen-mapping": "^0.3.5", @@ -5124,7 +5126,6 @@ "version": "1.1.2", "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/buffer-from/-/buffer-from-1.1.2.tgz", "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "devOptional": true, "license": "MIT" }, "node_modules/bytes": { @@ -5380,7 +5381,6 @@ "version": "2.20.3", "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/commander/-/commander-2.20.3.tgz", "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "devOptional": true, "license": "MIT" }, "node_modules/compare-versions": { @@ -5508,6 +5508,12 @@ "node": ">= 8" } }, + "node_modules/crypto-js": { + "version": "3.3.0", + "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/crypto-js/-/crypto-js-3.3.0.tgz", + "integrity": "sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q==", + "license": "MIT" + }, "node_modules/css-font-size-keywords": { "version": "1.0.0", "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/css-font-size-keywords/-/css-font-size-keywords-1.0.0.tgz", @@ -9794,7 +9800,6 @@ "version": "0.5.21", "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/source-map-support/-/source-map-support-0.5.21.tgz", "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "devOptional": true, "license": "MIT", "dependencies": { "buffer-from": "^1.0.0", @@ -10035,7 +10040,6 @@ "version": "5.42.0", "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/terser/-/terser-5.42.0.tgz", "integrity": "sha512-UYCvU9YQW2f/Vwl+P0GfhxJxbUGLwd+5QrrGgLajzWAtC/23AX0vcise32kkP7Eu0Wu9VlzzHAXkLObgjQfFlQ==", - "devOptional": true, "license": "BSD-2-Clause", "dependencies": { "@jridgewell/source-map": "^0.3.3", @@ -10454,6 +10458,19 @@ "node": ">= 0.4.0" } }, + "node_modules/uuid": { + "version": "11.1.0", + "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/uuid/-/uuid-11.1.0.tgz", + "integrity": "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "license": "MIT", + "bin": { + "uuid": "dist/esm/bin/uuid" + } + }, "node_modules/v8-to-istanbul": { "version": "8.1.1", "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz", diff --git a/src/App.vue b/src/App.vue index dd7688f5..28fdcff6 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,81 +1,116 @@ - \ No newline at end of file +/* 多行文本溢出 */ +.multi-line-ellipsis { + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 3; + /* 显示的行数 */ + overflow: hidden; +} + diff --git a/src/api/courseDetail.js b/src/api/courseDetail.js new file mode 100644 index 00000000..fdaab1b9 --- /dev/null +++ b/src/api/courseDetail.js @@ -0,0 +1,12 @@ +import request from '@/api/request' + +const base_url = '/traapp' + +// 获取课程分类树接口 +export const getCourseDetailApi = (data) => { + return request({ + url: base_url + '/crsInfo/queryCrsInfoDetail', + method: 'post', + data + }); +}; diff --git a/src/pages.json b/src/pages.json index e1de7c14..a1259033 100644 --- a/src/pages.json +++ b/src/pages.json @@ -10,6 +10,18 @@ } }, { +<<<<<<< HEAD + "path": "pages/courseDetail/index", + "style": { + "navigationBarTitleText": "课程详情", + "app-plus": { + "titleNView": false + } + } + }, + { +======= +>>>>>>> f0015d5ea46c4904ce35c5ec4a03028d9ec6d5b4 "path": "pages/study/index", "style": { "navigationBarTitleText": "学习", @@ -81,6 +93,8 @@ "titleNView": false } } +<<<<<<< HEAD +======= }, { "path": "pages/course/index", @@ -90,6 +104,7 @@ "titleNView": false } } +>>>>>>> f0015d5ea46c4904ce35c5ec4a03028d9ec6d5b4 } ], "tabBar": { diff --git a/src/pages/courseDetail/index.vue b/src/pages/courseDetail/index.vue new file mode 100644 index 00000000..46a84b1d --- /dev/null +++ b/src/pages/courseDetail/index.vue @@ -0,0 +1,306 @@ + + + + + diff --git a/src/pagesOther.json b/src/pagesOther.json index 679796b0..b720cdef 100644 --- a/src/pagesOther.json +++ b/src/pagesOther.json @@ -8,6 +8,15 @@ "titleNView": false } } + }, + { + "path": "pages/courseDetail/index", + "style": { + "navigationBarTitleText": "课程详情", + "app-plus": { + "titleNView": false + } + } } ], "tabBar": { diff --git a/src/static/images/courseDetail/mipmap-xhdpi/bg.png b/src/static/images/courseDetail/mipmap-xhdpi/bg.png new file mode 100644 index 00000000..004f0007 Binary files /dev/null and b/src/static/images/courseDetail/mipmap-xhdpi/bg.png differ diff --git a/src/static/images/courseDetail/mipmap-xhdpi/ditu.png b/src/static/images/courseDetail/mipmap-xhdpi/ditu.png new file mode 100644 index 00000000..ec6af6e1 Binary files /dev/null and b/src/static/images/courseDetail/mipmap-xhdpi/ditu.png differ diff --git a/src/static/images/courseDetail/mipmap-xhdpi/yixue.png b/src/static/images/courseDetail/mipmap-xhdpi/yixue.png new file mode 100644 index 00000000..ce4481f0 Binary files /dev/null and b/src/static/images/courseDetail/mipmap-xhdpi/yixue.png differ diff --git a/src/static/images/courseDetail/mipmap-xhdpi/zhishidian.png b/src/static/images/courseDetail/mipmap-xhdpi/zhishidian.png new file mode 100644 index 00000000..b85c6734 Binary files /dev/null and b/src/static/images/courseDetail/mipmap-xhdpi/zhishidian.png differ diff --git a/src/static/images/courseDetail/课程详情-介绍_slices.zip b/src/static/images/courseDetail/课程详情-介绍_slices.zip new file mode 100644 index 00000000..a9030479 Binary files /dev/null and b/src/static/images/courseDetail/课程详情-介绍_slices.zip differ diff --git a/src/uni_modules/uv-ui-tools/libs/css/color.scss b/src/uni_modules/uv-ui-tools/libs/css/color.scss index ce657434..3fac3932 100644 --- a/src/uni_modules/uv-ui-tools/libs/css/color.scss +++ b/src/uni_modules/uv-ui-tools/libs/css/color.scss @@ -6,7 +6,7 @@ $uv-border-color: #dadbde !default; $uv-bg-color: #f3f4f6 !default; $uv-disabled-color: #c8c9cc !default; -$uv-primary: #3c9cff !default; +$uv-primary: #0066ff !default; $uv-primary-dark: #398ade !default; $uv-primary-disabled: #9acafc !default; $uv-primary-light: #ecf5ff !default;