Browse Source

20231129

master
梁欣 1 year ago
parent
commit
09a63c9f0e
  1. 125
      package-lock.json
  2. 12
      package.json
  3. 2
      pages.json
  4. 80
      pages/fadada/type_1.vue
  5. 80
      pages/fadada/type_2.vue
  6. 12
      pages/product/goods/list.vue
  7. 7
      pages_template/components/form/form-slot.vue
  8. 9
      windows/topWindow.vue

125
package-lock.json

@ -1,125 +0,0 @@
{
"name": "vk-unicloud-admin",
"version": "1.17.3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
"async-validator": {
"version": "1.8.5",
"resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz",
"integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==",
"requires": {
"babel-runtime": "6.x"
}
},
"babel-helper-vue-jsx-merge-props": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
"integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg=="
},
"babel-runtime": {
"version": "6.26.0",
"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
"integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==",
"requires": {
"core-js": "^2.4.0",
"regenerator-runtime": "^0.11.0"
}
},
"core-js": {
"version": "2.6.12",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
"integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
},
"deepmerge": {
"version": "1.5.2",
"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
"integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="
},
"element-ui": {
"version": "2.15.13",
"resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.13.tgz",
"integrity": "sha512-LJoatEYX6WV74FqXBss8Xfho9fh9rjDSzrDrTyREdGb1h1R3uRvmLh5jqp2JU137aj4/BgqA3K06RQpQBX33Bg==",
"requires": {
"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"
}
},
"normalize-wheel": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
"integrity": "sha512-1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA=="
},
"regenerator-runtime": {
"version": "0.11.1",
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
"integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
},
"resize-observer-polyfill": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
"integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
},
"sortablejs": {
"version": "1.10.2",
"resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.10.2.tgz",
"integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A=="
},
"throttle-debounce": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz",
"integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg=="
},
"umy-table": {
"version": "1.1.8",
"resolved": "https://registry.npmjs.org/umy-table/-/umy-table-1.1.8.tgz",
"integrity": "sha512-yqPMFwZ6MUNqI73KamsNKBTbHRA7VuVZDEWobaySghtf4n/s7INuTNQoADB/ROVK57WOXr99Xpnol0aMqGlASA==",
"requires": {
"async-validator": "~1.8.1",
"deepmerge": "^1.2.0",
"normalize-wheel": "^1.0.1",
"resize-observer-polyfill": "^1.5.0",
"throttle-debounce": "^1.0.1",
"vuedraggable": "^2.23.2",
"xe-utils": "^3.0.0-beta.12"
}
},
"umy-ui": {
"version": "1.1.6",
"resolved": "https://registry.npmjs.org/umy-ui/-/umy-ui-1.1.6.tgz",
"integrity": "sha512-wX0S29B5sFn8q0MvU9PEl8DGZeQmZXOJlLrwaCJ2UHiIQZCANWgXMBjjQgpaequ1gRZ8BekEu7Sn7hJccm9YMQ==",
"requires": {
"async-validator": "~1.8.1",
"deepmerge": "^1.2.0",
"normalize-wheel": "^1.0.1",
"resize-observer-polyfill": "^1.5.0",
"throttle-debounce": "^1.0.1",
"umy-table": "1.1.8",
"vuedraggable": "^2.23.2",
"xe-utils": "^3.0.0-beta.12"
}
},
"vk-unicloud-admin-ui": {
"version": "1.17.46",
"resolved": "https://registry.npmjs.org/vk-unicloud-admin-ui/-/vk-unicloud-admin-ui-1.17.46.tgz",
"integrity": "sha512-VJvi8Gm3mfZOFEilIrZ1bSoi192ov9hPzSFzkR6l62pqJ3UEwgjTr5L2gQqxw4twb+y5qDmWZPS4dQMwya+iiQ=="
},
"vuedraggable": {
"version": "2.24.3",
"resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.24.3.tgz",
"integrity": "sha512-6/HDXi92GzB+Hcs9fC6PAAozK1RLt1ewPTLjK0anTYguXLAeySDmcnqE8IC0xa7shvSzRjQXq3/+dsZ7ETGF3g==",
"requires": {
"sortablejs": "1.10.2"
}
},
"xe-utils": {
"version": "3.5.13",
"resolved": "https://registry.npmjs.org/xe-utils/-/xe-utils-3.5.13.tgz",
"integrity": "sha512-ORT6ghCRk0mUVavMBxetcPzUPskS6NGfntzpWazJ86e+XU0uK4HwHfDhN/jKATiyInrOH5RwQo9SO/+DB8XeBw=="
}
}
}

12
package.json

@ -20,9 +20,19 @@
"license": "MIT", "license": "MIT",
"homepage": "https://vkdoc.fsq.pub/admin/", "homepage": "https://vkdoc.fsq.pub/admin/",
"dependencies": { "dependencies": {
"async-validator": "^4.2.5",
"babel-helper-vue-jsx-merge-props": "^2.0.3",
"element-ui": "2.15.13", "element-ui": "2.15.13",
"normalize-wheel": "^1.0.1",
"resize-observer-polyfill": "^1.5.1",
"sortablejs": "^1.15.0",
"throttle-debounce": "^1.1.0",
"umy-table": "^1.1.8",
"umy-ui": "1.1.6", "umy-ui": "1.1.6",
"vk-unicloud-admin-ui": "^1.17.45"
"vk-unicloud-admin-ui": "^1.17.45",
"vue": "2",
"vuedraggable": "^2.24.3",
"xe-utils": "^3.5.14"
}, },
"engines": { "engines": {
"HBuilderX": "^3.1.10" "HBuilderX": "^3.1.10"

2
pages.json

@ -7,6 +7,8 @@
{ "path": "pages/enquiry/template/list"}, { "path": "pages/enquiry/template/list"},
{ "path": "pages/enquiry/attributes/list"}, { "path": "pages/enquiry/attributes/list"},
{ "path": "pages/contract/template/list"}, { "path": "pages/contract/template/list"},
{ "path": "pages/fadada/type_1"},
{ "path": "pages/fadada/type_2"},
{ {
"path": "pages/login/index", "path": "pages/login/index",
"style": { "style": {

80
pages/fadada/type_1.vue

@ -0,0 +1,80 @@
<template>
<div>
<vk-data-table-query
v-model="queryForm1.formData"
:columns="queryForm1.columns"
@search="search"
></vk-data-table-query>
<vk-data-table
ref="table1"
:action="table1.action"
:columns="table1.columns"
:query-form-param="queryForm1"
:right-btns="[]"
:selection="true"
:row-no="true"
:pagination="true"
></vk-data-table>
</div>
</template>
<script>
export default {
name: "index",
data() {
return {
queryForm1: {
//
formData: {
dcloud_appid: "",
type: 2
//allow_login_background : true,
},
// fieldName:,key
columns: [
{key: "username", title: "用户名", type: "text", width: 160, mode: "%%"},
{key: "nickname", title: "昵称", type: "text", width: 140, mode: "%%"},
{key: "mobile", title: "手机号", type: "text", width: 140, mode: "%%"},
]
},
table1: {
//
action: "admin/fadada/sys/getList",
//
columns: [
{key: "user.mobile", title: "手机号", type: "text", width: 120, defaultValue: ""},
// {
// key: "", title: "", type: "text", width: 120, formatter: (val, row, column, index) => {
// return parseInt(row.type) === 1 ? '' : ''
// }
// },
{
key: "mobile", title: "个人/企业信息", type: "html", defaultValue: "",
formatter: (val, row, column, index) => {
let str
if (parseInt(row.type) === 1) {
str = `<view>${row.person.personName}</view>`
str += `<view>${row.person.mobile}</view>`
} else {
str = `<view>${row.company.companyName}</view>`
str += `<view>${row.manager.personName}/${row.manager.mobile}</view>`
}
return str;
}
},
{key: "authenticationSubmitTime", title: "认证时间", type: "time", width: 160, sortable: "custom"},
],
//
multipleSelection: [],
//
selectItem: "",
}
}
},
methods: {
search() {
this.$refs.table1.query();
},
}
}
</script>

80
pages/fadada/type_2.vue

@ -0,0 +1,80 @@
<template>
<div>
<vk-data-table-query
v-model="queryForm1.formData"
:columns="queryForm1.columns"
@search="search"
></vk-data-table-query>
<vk-data-table
ref="table1"
:action="table1.action"
:columns="table1.columns"
:query-form-param="queryForm1"
:right-btns="[]"
:selection="true"
:row-no="true"
:pagination="true"
></vk-data-table>
</div>
</template>
<script>
export default {
name: "index",
data() {
return {
queryForm1: {
//
formData: {
dcloud_appid: "",
type: 2
//allow_login_background : true,
},
// fieldName:,key
columns: [
{key: "username", title: "用户名", type: "text", width: 160, mode: "%%"},
{key: "nickname", title: "昵称", type: "text", width: 140, mode: "%%"},
{key: "mobile", title: "手机号", type: "text", width: 140, mode: "%%"},
]
},
table1: {
//
action: "admin/fadada/sys/getList",
//
columns: [
{key: "user.mobile", title: "手机号", type: "text", width: 120, defaultValue: ""},
{
key: "", title: "认证类型", type: "text", width: 120, formatter: (val, row, column, index) => {
return parseInt(row.type) === 1 ? '个人' : '企业'
}
},
// {
// key: "mobile", title: "/", type: "html", defaultValue: "",
// formatter: (val, row, column, index) => {
// let str
// if (parseInt(row.type) === 1) {
// str = `<view>${row.person.personName}</view>`
// str += `<view>${row.person.mobile}</view>`
// } else {
// str = `<view>${row.company.companyName}</view>`
// str += `<view>${row.manager.personName}/${row.manager.mobile}</view>`
// }
// return str;
// }
// },
{key: "authenticationSubmitTime", title: "认证时间", type: "time", width: 160, sortable: "custom"},
],
//
multipleSelection: [],
//
selectItem: "",
}
}
},
methods: {
search() {
this.$refs.table1.query();
},
}
}
</script>

12
pages/product/goods/list.vue

@ -191,15 +191,21 @@
}, },
watch: (obj)=> { watch: (obj)=> {
console.log(obj); console.log(obj);
this.form1.data.name = obj.option.map(item => item.name),join("、")
this.form1.data.name = obj.option.map(item => item.name).join("、")
} }
}, },
{ {
key: "address", key: "address",
title: "供货地",
type: "address",
title: "所属用户",
type: "select",
placeholder: "请输入供货地", placeholder: "请输入供货地",
}, },
{
key: "address",
title: "供货地",
type: "address",
placeholder: "请输入供货地",
},
{ {
key: "files", key: "files",
title: "附件", title: "附件",

7
pages_template/components/form/form-slot.vue

@ -24,6 +24,9 @@
<el-rate v-model="form[keyName]"></el-rate> <el-rate v-model="form[keyName]"></el-rate>
</view> </view>
</template> </template>
<template v-slot:asd.test="{ form, keyName }">
asdasd
</template>
<template v-slot:footer="{ loading }"> <template v-slot:footer="{ loading }">
<el-button plain style="margin-right: 20px;width: 80px;" @click="onCancel">返回</el-button> <el-button plain style="margin-right: 20px;width: 80px;" @click="onCancel">返回</el-button>
@ -68,6 +71,10 @@
columns:[ columns:[
{ key: "text", title:"text类型字段", type:"text" }, { key: "text", title:"text类型字段", type:"text" },
{ key: "rate", title:"插糟用法", type:"text" }, { key: "rate", title:"插糟用法", type:"text" },
{ key: "asd", title:"", type:"object",
columns: [
{ key: "test", title:"插糟用法", type:"html",}
]},
], ],
// //
rules: { rules: {

9
windows/topWindow.vue

@ -4,10 +4,10 @@
<view class="left"> <view class="left">
<!-- 模式一纯图片 --> <!-- 模式一纯图片 -->
<navigator class="logo-mode-1" open-type="reLaunch" url="/">
<image :src="vk.getVuex('$app.staticUrl.navBar.logo1')" mode="aspectFill" class="logo-image" v-show="vk.getVuex('$app.leftCollapse')"></image>
<image :src="vk.getVuex('$app.staticUrl.navBar.logo2')" mode="aspectFill" class="logo-image" v-show="!vk.getVuex('$app.leftCollapse')"></image>
</navigator>
<!-- <navigator class="logo-mode-1" open-type="reLaunch" url="/">-->
<!-- <image :src="vk.getVuex('$app.staticUrl.navBar.logo1')" mode="aspectFill" class="logo-image" v-show="vk.getVuex('$app.leftCollapse')"></image>-->
<!-- <image :src="vk.getVuex('$app.staticUrl.navBar.logo2')" mode="aspectFill" class="logo-image" v-show="!vk.getVuex('$app.leftCollapse')"></image>-->
<!-- </navigator>-->
<!-- 模式二图片+文字 --> <!-- 模式二图片+文字 -->
<!-- <navigator class="logo-mode-2" open-type="reLaunch" url="/"> <!-- <navigator class="logo-mode-2" open-type="reLaunch" url="/">
@ -265,6 +265,7 @@ export default {
color: $top-window-text-color; color: $top-window-text-color;
/* 左侧 */ /* 左侧 */
.left { .left {
background-color: rgb(25, 26, 35);
width: calc(var(--window-left)); width: calc(var(--window-left));
} }
/* 右侧 */ /* 右侧 */

Loading…
Cancel
Save