diff --git a/components/wm-watermark/watermark.md b/components/wm-watermark/watermark.md new file mode 100644 index 0000000..f00c9ad --- /dev/null +++ b/components/wm-watermark/watermark.md @@ -0,0 +1,29 @@ +## 自定义水印添加 +*** +一款声明版权立场的组件 +该组件参考了 [315500033@qq.com](https://ext.dcloud.net.cn/plugin?id=362) 大神的组件 修改后符合自己的编码习惯 让水印有更多的展示方式 + +### 使用方式 +#### 在 ``script`` 中引入组件: +```javascript + import wmWatermark from '../../components/wm-watermark.vue'; + export default { + components: {wmWatermark} + } +``` + +#### 在 ``template`` 中使用组件: + +```html + +``` + +### **属性说明** + +| 属性 | 类型 | 默认值 | 说明 | +| :---: | :---: | :---: | :--------: | +| text | String | 无 | 设置水印文字 注:(文字优先图片) | +| imgUrl | String | 无 | 设置水印图片链接 注:(文字优先图片) | +| opacity | Number,String | 0.6 | 设置显示透明度 | +| num | Number | 20 | 设置水印数量 | + diff --git a/components/wm-watermark/wm-watermark.vue b/components/wm-watermark/wm-watermark.vue new file mode 100644 index 0000000..939676b --- /dev/null +++ b/components/wm-watermark/wm-watermark.vue @@ -0,0 +1,72 @@ + + + + + diff --git a/main.js b/main.js index 4ec6380..57e4efb 100644 --- a/main.js +++ b/main.js @@ -29,7 +29,7 @@ export function createApp() { app.config.globalProperties.$system = plus.os.name; // #endif app.config.globalProperties.$systemInfo = systemInfo - uni.setStorageSync('version', '1.0.6.sp9') + uni.setStorageSync('version', '1.0.6.sp10') app.config.globalProperties.$version = uni.getStorageSync('version') app.use(globalMethods); return { diff --git a/pages.json b/pages.json index 4e91a1b..0c30da6 100644 --- a/pages.json +++ b/pages.json @@ -436,6 +436,46 @@ "navigationBarTitleText" : "微信支付成功", "navigationStyle": "custom" } + }, + { + "path" : "score/index", + "style" : + { + "navigationBarTitleText" : "高考分数", + "navigationStyle": "custom" + } + }, + { + "path" : "score/center", + "style" : + { + "navigationBarTitleText" : "查询中心", + "navigationStyle": "custom" + } + }, + { + "path" : "score/chongqing", + "style" : + { + "navigationBarTitleText" : "重庆", + "navigationStyle": "custom" + } + }, + { + "path" : "score/hebei", + "style" : + { + "navigationBarTitleText" : "河北", + "navigationStyle": "custom" + } + }, + { + "path" : "score/guandong", + "style" : + { + "navigationBarTitleText" : "广东", + "navigationStyle": "custom" + } } ] }, diff --git a/pages/index/index.nvue b/pages/index/index.nvue index 56e4747..c7a4c89 100644 --- a/pages/index/index.nvue +++ b/pages/index/index.nvue @@ -315,6 +315,11 @@ const otherList = [{ name: "从夯倒拉排名", path: "/pages/other/ranking/ranking" }, +{ + icon: "/static/image/other/score/gaokao.png", + name: "高考", + path: "/pages/other/score/index" +}, ] const data = reactive({ diff --git a/pages/other/bank/jsyh.vue b/pages/other/bank/jsyh.vue index 6d54f49..ea73578 100644 --- a/pages/other/bank/jsyh.vue +++ b/pages/other/bank/jsyh.vue @@ -6,6 +6,9 @@ + + @@ -61,9 +64,6 @@ - - @@ -233,6 +233,7 @@ onPageScroll } from "@dcloudio/uni-app"; + import NavBar from '@/components/nav-bar/nav-bar' const CACHE_KEY = 'jsyh_account_info'; const FOOTER_IMAGE_KEY = 'jsyh_footer_image'; diff --git a/pages/other/score/center.vue b/pages/other/score/center.vue new file mode 100644 index 0000000..6405b61 --- /dev/null +++ b/pages/other/score/center.vue @@ -0,0 +1,977 @@ + + + + + + \ No newline at end of file diff --git a/pages/other/score/chongqing.vue b/pages/other/score/chongqing.vue new file mode 100644 index 0000000..8ee5729 --- /dev/null +++ b/pages/other/score/chongqing.vue @@ -0,0 +1,1282 @@ + + + + + + \ No newline at end of file diff --git a/pages/other/score/guandong.vue b/pages/other/score/guandong.vue new file mode 100644 index 0000000..da6629a --- /dev/null +++ b/pages/other/score/guandong.vue @@ -0,0 +1,560 @@ + + + + + + \ No newline at end of file diff --git a/pages/other/score/hebei.vue b/pages/other/score/hebei.vue new file mode 100644 index 0000000..9758ff5 --- /dev/null +++ b/pages/other/score/hebei.vue @@ -0,0 +1,1434 @@ + + + + + + \ No newline at end of file diff --git a/pages/other/score/index.vue b/pages/other/score/index.vue new file mode 100644 index 0000000..ef2dc75 --- /dev/null +++ b/pages/other/score/index.vue @@ -0,0 +1,173 @@ + + + + + + \ No newline at end of file diff --git a/static/image/other/score/center/home.png b/static/image/other/score/center/home.png new file mode 100644 index 0000000..0661bc8 Binary files /dev/null and b/static/image/other/score/center/home.png differ diff --git a/static/image/other/score/center/rightBtn.png b/static/image/other/score/center/rightBtn.png new file mode 100644 index 0000000..0531cbc Binary files /dev/null and b/static/image/other/score/center/rightBtn.png differ diff --git a/static/image/other/score/chongqing.png b/static/image/other/score/chongqing.png new file mode 100644 index 0000000..bdbf5cd Binary files /dev/null and b/static/image/other/score/chongqing.png differ diff --git a/static/image/other/score/chongqing/close.png b/static/image/other/score/chongqing/close.png new file mode 100644 index 0000000..63827d2 Binary files /dev/null and b/static/image/other/score/chongqing/close.png differ diff --git a/static/image/other/score/chongqing/more.png b/static/image/other/score/chongqing/more.png new file mode 100644 index 0000000..16744ea Binary files /dev/null and b/static/image/other/score/chongqing/more.png differ diff --git a/static/image/other/score/chongqing/tab.png b/static/image/other/score/chongqing/tab.png new file mode 100644 index 0000000..d50c40d Binary files /dev/null and b/static/image/other/score/chongqing/tab.png differ diff --git a/static/image/other/score/chongqingbg.png b/static/image/other/score/chongqingbg.png new file mode 100644 index 0000000..869fdf9 Binary files /dev/null and b/static/image/other/score/chongqingbg.png differ diff --git a/static/image/other/score/gaokao.png b/static/image/other/score/gaokao.png new file mode 100644 index 0000000..b145a8f Binary files /dev/null and b/static/image/other/score/gaokao.png differ diff --git a/static/image/other/score/guandong.png b/static/image/other/score/guandong.png new file mode 100644 index 0000000..4e3cffc Binary files /dev/null and b/static/image/other/score/guandong.png differ diff --git a/static/image/other/score/guandong/guandongbg.png b/static/image/other/score/guandong/guandongbg.png new file mode 100644 index 0000000..5fb6ed9 Binary files /dev/null and b/static/image/other/score/guandong/guandongbg.png differ diff --git a/static/image/other/score/guandong/leftIcon.png b/static/image/other/score/guandong/leftIcon.png new file mode 100644 index 0000000..2dee655 Binary files /dev/null and b/static/image/other/score/guandong/leftIcon.png differ diff --git a/static/image/other/score/guandong/rightIcon.png b/static/image/other/score/guandong/rightIcon.png new file mode 100644 index 0000000..13a7a0c Binary files /dev/null and b/static/image/other/score/guandong/rightIcon.png differ diff --git a/static/image/other/score/guandongbg.png b/static/image/other/score/guandongbg.png new file mode 100644 index 0000000..89d5e07 Binary files /dev/null and b/static/image/other/score/guandongbg.png differ diff --git a/static/image/other/score/hebei.png b/static/image/other/score/hebei.png new file mode 100644 index 0000000..397a8af Binary files /dev/null and b/static/image/other/score/hebei.png differ diff --git a/static/image/other/score/hebei/Copyright.png b/static/image/other/score/hebei/Copyright.png new file mode 100644 index 0000000..52c7172 Binary files /dev/null and b/static/image/other/score/hebei/Copyright.png differ diff --git a/static/image/other/score/hebei/Watermark.png b/static/image/other/score/hebei/Watermark.png new file mode 100644 index 0000000..83defd8 Binary files /dev/null and b/static/image/other/score/hebei/Watermark.png differ diff --git a/static/image/other/score/hebei/heibeiheaderBg.png b/static/image/other/score/hebei/heibeiheaderBg.png new file mode 100644 index 0000000..2f6528f Binary files /dev/null and b/static/image/other/score/hebei/heibeiheaderBg.png differ diff --git a/static/image/other/score/hebeibg.png b/static/image/other/score/hebeibg.png new file mode 100644 index 0000000..42643eb Binary files /dev/null and b/static/image/other/score/hebeibg.png differ diff --git a/static/image/other/score/icon1.png b/static/image/other/score/icon1.png new file mode 100644 index 0000000..365ba06 Binary files /dev/null and b/static/image/other/score/icon1.png differ diff --git a/static/image/other/score/icon1bg.png b/static/image/other/score/icon1bg.png new file mode 100644 index 0000000..bb625d1 Binary files /dev/null and b/static/image/other/score/icon1bg.png differ