Merge branch 'master' of http://192.168.0.105:10010/r/qfqk-android

liuyg

2022-03-07 8e249f6777e29669696a5705ffa68fa9bc555a52

Merge branch 'master' of http://192.168.0.105:10010/r/qfqk-android

 manifest.json

@@ -1,6 +1,6 @@
{
    "name" : "洪城义警",
    "appid" : "__UNI__ECA0186",
    "appid" : "__UNI__7672DEF",
    "description" : "",
    "versionName" : "1.0.0",
    "versionCode" : "100",

 package-lock.json

@@ -1,8 +1,242 @@
{
  "name": "qfqk-android",
  "version": "1.0.0",
  "lockfileVersion": 1,
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "qfqk-android",
      "version": "1.0.0",
      "license": "ISC",
      "dependencies": {
        "@smallwei/avue": "^2.8.14",
        "axios": "^0.21.1",
        "js-md5": "^0.7.3",
        "uni-read-pages": "^1.0.5",
        "uview-ui": "^1.8.4",
        "weex-bindingx": "0.0.49"
      },
      "devDependencies": {}
    },
    "node_modules/@smallwei/avue": {
      "version": "2.8.17",
      "resolved": "https://registry.nlark.com/@smallwei/avue/download/@smallwei/avue-2.8.17.tgz?cache=0&sync_timestamp=1626353632228&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40smallwei%2Favue%2Fdownload%2F%40smallwei%2Favue-2.8.17.tgz",
      "integrity": "sha1-h4o+2Cl0caOqXDBwfWkkynkmrQI=",
      "dependencies": {
        "axios": "^0.21.1",
        "countup.js": "^1.9.3",
        "dayjs": "^1.10.4",
        "deepmerge": "^3.1.0",
        "element-ui": "^2.15.1",
        "nprogress": "^0.2.0",
        "vue": "^2.5.17",
        "vuedraggable": "^2.17.0"
      }
    },
    "node_modules/animation-util": {
      "version": "1.0.11",
      "resolved": "https://registry.nlark.com/animation-util/download/animation-util-1.0.11.tgz",
      "integrity": "sha1-T2SFUT0KAVjl/DatMfGj+7sXEI8=",
      "dependencies": {
        "object-assign": "^4.1.1"
      }
    },
    "node_modules/async-validator": {
      "version": "1.8.5",
      "resolved": "https://registry.nlark.com/async-validator/download/async-validator-1.8.5.tgz",
      "integrity": "sha1-3D4I7B/Q3dtn5ghC8CwM0c7G1/A=",
      "dependencies": {
        "babel-runtime": "6.x"
      }
    },
    "node_modules/axios": {
      "version": "0.21.1",
      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
      "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
      "dependencies": {
        "follow-redirects": "^1.10.0"
      }
    },
    "node_modules/babel-helper-vue-jsx-merge-props": {
      "version": "2.0.3",
      "resolved": "https://registry.npm.taobao.org/babel-helper-vue-jsx-merge-props/download/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
      "integrity": "sha1-Iq69OzOQIyjlEyk6jkmSs4T58bY="
    },
    "node_modules/babel-runtime": {
      "version": "6.26.0",
      "resolved": "https://registry.npm.taobao.org/babel-runtime/download/babel-runtime-6.26.0.tgz",
      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
      "dependencies": {
        "core-js": "^2.4.0",
        "regenerator-runtime": "^0.11.0"
      }
    },
    "node_modules/bindingx-parser": {
      "version": "0.0.3",
      "resolved": "https://registry.nlark.com/bindingx-parser/download/bindingx-parser-0.0.3.tgz",
      "integrity": "sha1-sV6bVhFcOZFGqlbjqW+sNAmCl60="
    },
    "node_modules/bindingx-web-polyfill": {
      "version": "0.1.18",
      "resolved": "https://registry.npm.taobao.org/bindingx-web-polyfill/download/bindingx-web-polyfill-0.1.18.tgz",
      "integrity": "sha1-RTG87woseAcxudCg9lGAcQnygnA=",
      "dependencies": {
        "animation-util": "^1.0.10",
        "object-assign": "^4.1.1",
        "simple-lodash": "^0.0.3"
      }
    },
    "node_modules/bindingx-web-polyfill/node_modules/simple-lodash": {
      "version": "0.0.3",
      "resolved": "https://registry.npm.taobao.org/simple-lodash/download/simple-lodash-0.0.3.tgz",
      "integrity": "sha1-YSrhwF9pCEgdjDQuy+NmPSN5QeA="
    },
    "node_modules/core-js": {
      "version": "2.6.12",
      "resolved": "https://registry.nlark.com/core-js/download/core-js-2.6.12.tgz?cache=0&sync_timestamp=1624966102256&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcore-js%2Fdownload%2Fcore-js-2.6.12.tgz",
      "integrity": "sha1-2TM9+nsGXjR8xWgiGdb2kIWcwuw=",
      "hasInstallScript": true
    },
    "node_modules/countup.js": {
      "version": "1.9.3",
      "resolved": "https://registry.npm.taobao.org/countup.js/download/countup.js-1.9.3.tgz",
      "integrity": "sha1-zj5QzXFgRB5HjwfaMYle3MDxyd0="
    },
    "node_modules/dayjs": {
      "version": "1.10.6",
      "resolved": "https://registry.nlark.com/dayjs/download/dayjs-1.10.6.tgz",
      "integrity": "sha1-KIsqqC8thBimydTfWJjAc3rQKmM="
    },
    "node_modules/deepmerge": {
      "version": "3.3.0",
      "resolved": "https://registry.npm.taobao.org/deepmerge/download/deepmerge-3.3.0.tgz",
      "integrity": "sha1-08R/1vOpPVF7FEJrBiihewEl9fc=",
      "engines": {
        "node": ">=0.10.0"
      }
    },
    "node_modules/element-ui": {
      "version": "2.15.3",
      "resolved": "https://registry.nlark.com/element-ui/download/element-ui-2.15.3.tgz",
      "integrity": "sha1-VRCKuCo7zGRuewVwhxxIupYwBlI=",
      "dependencies": {
        "async-validator": "~1.8.1",
        "babel-helper-vue-jsx-merge-props": "^2.0.0",
        "deepmerge": "^1.2.0",
        "normalize-wheel": "^1.0.1",
        "resize-observer-polyfill": "^1.5.0",
        "throttle-debounce": "^1.0.1"
      }
    },
    "node_modules/element-ui/node_modules/deepmerge": {
      "version": "1.5.2",
      "resolved": "https://registry.npm.taobao.org/deepmerge/download/deepmerge-1.5.2.tgz",
      "integrity": "sha1-EEmdhohEza1P7ghC34x/bwyVp1M=",
      "engines": {
        "node": ">=0.10.0"
      }
    },
    "node_modules/follow-redirects": {
      "version": "1.14.1",
      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz",
      "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==",
      "engines": {
        "node": ">=4.0"
      }
    },
    "node_modules/js-md5": {
      "version": "0.7.3",
      "resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.7.3.tgz",
      "integrity": "sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ=="
    },
    "node_modules/normalize-wheel": {
      "version": "1.0.1",
      "resolved": "https://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz",
      "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
    },
    "node_modules/nprogress": {
      "version": "0.2.0",
      "resolved": "https://registry.nlark.com/nprogress/download/nprogress-0.2.0.tgz",
      "integrity": "sha1-y480xTIT2JVyP8urkH6UIq28r7E="
    },
    "node_modules/object-assign": {
      "version": "4.1.1",
      "resolved": "https://registry.npm.taobao.org/object-assign/download/object-assign-4.1.1.tgz",
      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
      "engines": {
        "node": ">=0.10.0"
      }
    },
    "node_modules/regenerator-runtime": {
      "version": "0.11.1",
      "resolved": "https://registry.nlark.com/regenerator-runtime/download/regenerator-runtime-0.11.1.tgz",
      "integrity": "sha1-vgWtf5v30i4Fb5cmzuUBf78Z4uk="
    },
    "node_modules/resize-observer-polyfill": {
      "version": "1.5.1",
      "resolved": "https://registry.npm.taobao.org/resize-observer-polyfill/download/resize-observer-polyfill-1.5.1.tgz",
      "integrity": "sha1-DpAg3T0hAkRY1OvSfiPkAmmBBGQ="
    },
    "node_modules/simple-lodash": {
      "version": "0.0.2",
      "resolved": "https://registry.npm.taobao.org/simple-lodash/download/simple-lodash-0.0.2.tgz",
      "integrity": "sha1-2OtKYOmWpVClwa3ajvu3YpiSRrE="
    },
    "node_modules/sortablejs": {
      "version": "1.10.2",
      "resolved": "https://registry.nlark.com/sortablejs/download/sortablejs-1.10.2.tgz",
      "integrity": "sha1-bkA2TZE/mLhaFPZnj5K1wSIfUpA="
    },
    "node_modules/throttle-debounce": {
      "version": "1.1.0",
      "resolved": "https://registry.npm.taobao.org/throttle-debounce/download/throttle-debounce-1.1.0.tgz?cache=0&sync_timestamp=1604313880785&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fthrottle-debounce%2Fdownload%2Fthrottle-debounce-1.1.0.tgz",
      "integrity": "sha1-UYU9o3vmihVctugns1FKPEIuic0=",
      "engines": {
        "node": ">=4"
      }
    },
    "node_modules/uni-read-pages": {
      "version": "1.0.5",
      "resolved": "https://registry.npmjs.org/uni-read-pages/-/uni-read-pages-1.0.5.tgz",
      "integrity": "sha512-GkrrZ0LX0vn9R5k6RKEi0Ez3Q3e2vUpjXQ8Z6/K/d28KudI9ajqgt8WEjQFlG5EPm1K6uTArN8LlqmZTEixDUA==",
      "hasInstallScript": true
    },
    "node_modules/universal-env": {
      "version": "0.6.6",
      "resolved": "https://registry.nlark.com/universal-env/download/universal-env-0.6.6.tgz",
      "integrity": "sha1-3VrfgWqOw+kI1ISOFxTf4w3YqXA="
    },
    "node_modules/uview-ui": {
      "version": "1.8.4",
      "resolved": "https://registry.npm.taobao.org/uview-ui/download/uview-ui-1.8.4.tgz",
      "integrity": "sha1-4yu/I3lCHTGQIuMk4ct7U4fTvUQ="
    },
    "node_modules/vue": {
      "version": "2.6.14",
      "resolved": "https://registry.nlark.com/vue/download/vue-2.6.14.tgz?cache=0&sync_timestamp=1625229652956&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvue%2Fdownload%2Fvue-2.6.14.tgz",
      "integrity": "sha1-5RqlJQJQ1Wmj+606ilpofWA24jU="
    },
    "node_modules/vuedraggable": {
      "version": "2.24.3",
      "resolved": "https://registry.nlark.com/vuedraggable/download/vuedraggable-2.24.3.tgz",
      "integrity": "sha1-Q8k4SbdGokzlA+Ej1bJZxwG6DRk=",
      "dependencies": {
        "sortablejs": "1.10.2"
      }
    },
    "node_modules/weex-bindingx": {
      "version": "0.0.49",
      "resolved": "https://registry.npm.taobao.org/weex-bindingx/download/weex-bindingx-0.0.49.tgz",
      "integrity": "sha1-h4/LcX+2oifA+NQJi6HhPT4EYJQ=",
      "dependencies": {
        "bindingx-parser": "0.x.x",
        "bindingx-web-polyfill": "0.x.x",
        "object-assign": "^4.1.1",
        "simple-lodash": "^0.0.2",
        "universal-env": "0.x.x"
      }
    }
  },
  "dependencies": {
    "@smallwei/avue": {
      "version": "2.8.17",
@@ -171,8 +405,8 @@
    },
    "uni-read-pages": {
      "version": "1.0.5",
      "resolved": "https://registry.npm.taobao.org/uni-read-pages/download/uni-read-pages-1.0.5.tgz",
      "integrity": "sha1-RSyNyqiXe7rvYAkJvpJsjZcEOHw="
      "resolved": "https://registry.npmjs.org/uni-read-pages/-/uni-read-pages-1.0.5.tgz",
      "integrity": "sha512-GkrrZ0LX0vn9R5k6RKEi0Ez3Q3e2vUpjXQ8Z6/K/d28KudI9ajqgt8WEjQFlG5EPm1K6uTArN8LlqmZTEixDUA=="
    },
    "universal-env": {
      "version": "0.6.6",

 pages/exam/examResultPage.vue

@@ -39,8 +39,9 @@
        <view class="btnArea">
            <u-button class="btnClass" type="primary" :ripple="true" shape="circle" @click="backToHome">返回首页
            </u-button>
            <u-button class="btnClass" type="primary" :ripple="true" shape="circle" @click="goExam">继续模拟考试
            </u-button>
        </view>

    </view>
</template>

@@ -62,6 +63,11 @@
                uni.switchTab({
                    url: '/pages/home/home',
                })
            },
            goExam() {
                uni.navigateTo({
                    url: '/pages/exam/examTextPage'
                })
            }
        },
        computed: {