diff --git a/client_mp/App.vue b/client_mp/App.vue
index d8c41ed..1139c91 100644
--- a/client_mp/App.vue
+++ b/client_mp/App.vue
@@ -13,6 +13,9 @@
/**
* h5,app-plus(nvue下也为app-plus),mp-weixin,mp-alipay......
*/
+ this.$u.api.getUserInfo().then(res=>{
+ this.$u.vuex('vuex_user', res.data)
+ })
},
}
diff --git a/client_mp/common/http.api.js b/client_mp/common/http.api.js
index d465d13..1ca9035 100644
--- a/client_mp/common/http.api.js
+++ b/client_mp/common/http.api.js
@@ -19,12 +19,35 @@ const install = (Vue, vm) => {
let login = (params = {}) => vm.$u.post('/token/', params); //账户密码登录
// 将各个定义的接口名称,统一放进对象挂载到vm.$u.api(因为vm就是this,也即this.$u.api)下
- let getMyInspectTask = (params = {}) => vm.$u.get('/quality/subinspecttask/self/', params);
+ let getMyInspectTaskList = (params = {}) => vm.$u.get('/quality/subinspecttask/self/', params);
+
+ let getSubinspectTask = (id, params)=> vm.$u.get(`/quality/subinspecttask/${id}/`, params);
+
+ //获取子任务涉及的单位
+ let getSubtaskDepts = (id, params)=> vm.$u.get(`/quality/subinspecttask/${id}/depts/`, params);
+
+ //获取子任务单位的详细信息
+ let getSubtaskDept = (id, params)=> vm.$u.get(`/quality/inspectdept/${id}/`, params);
+ let getInspectRecords = (params)=> vm.$u.get('/quality/inspectrecord/', params);
+
+ let getInspectRecord = (id, params)=> vm.$u.get(`/quality/inspectrecord/${id}/`, params);
+
+ let checkInspectRecord = (id, params)=> vm.$u.put(`/quality/inspectrecord/${id}/check/`, params);
+
+ let upInspectDept = (id, params)=>vm.$u.put(`/quality/inspectdept/${id}/up/`, params);
vm.$u.api = {getUserInfo,
getCode,
codeLogin,
login,
- getMyInspectTask};
+ getMyInspectTaskList,
+ getSubinspectTask,
+ getSubtaskDepts,
+ getInspectRecords,
+ getSubtaskDept,
+ getInspectRecord,
+ checkInspectRecord,
+ upInspectDept
+ };
}
export default {
diff --git a/client_mp/common/http.interceptor.js b/client_mp/common/http.interceptor.js
index 9e2eeaa..0ef21f9 100644
--- a/client_mp/common/http.interceptor.js
+++ b/client_mp/common/http.interceptor.js
@@ -3,7 +3,7 @@
const install = (Vue, vm) => {
Vue.prototype.$u.http.setConfig({
// baseUrl: 'https://api.youzixy.com',
- baseUrl: 'http://10.0.11.127:8000/api',
+ baseUrl: vm.vuex_api,
// 如果将此值设置为true,拦截回调中将会返回服务端返回的所有数据response,而不是response.data
// 设置为true后,就需要在this.$u.http.interceptor.response进行多一次的判断,请打印查看具体值
// originalData: true,
@@ -54,7 +54,15 @@ const install = (Vue, vm) => {
return false;
}
else{
- vm.$u.toast(res.msg);
+ if(typeof(res.msg)=='string'){
+ vm.$u.toast(res.msg)
+ }else{
+ let msg = JSON.stringify(res.msg)
+ vm.$u.toast(res.msg)
+ }
+
+
+
return false;
}
}
diff --git a/client_mp/pages.json b/client_mp/pages.json
index f1dda24..153781a 100644
--- a/client_mp/pages.json
+++ b/client_mp/pages.json
@@ -20,49 +20,7 @@
}
},
- // 演示-组件
- {
- "path": "pages/example/components",
- "style": {
- "navigationBarTitleText": "组件"
- }
- },
- // avatarCropper-头像裁剪
- {
- "path": "uview-ui/components/u-avatar-cropper/u-avatar-cropper",
- "style": {
- "navigationBarTitleText": "头像裁剪",
- "navigationBarBackgroundColor": "#000000"
- }
- },
- // 演示-工具
- {
- "path": "pages/example/js",
- "style": {
- "navigationBarTitleText": "工具"
- }
- },
- // 演示-模板
- {
- "path": "pages/example/template",
- "style": {
- "navigationBarTitleText": "模板"
- }
- },
- // fullScreen-压窗屏
- {
- "path": "uview-ui/components/u-full-screen/u-full-screen",
- "style": {
- "navigationStyle": "custom",
- "app-plus": {
- "animationType": "fade-in",
- "background": "transparent",
- "backgroundColor": "rgba(0,0,0,0)",
- "popGesture": "none"
- }
- }
- }
- ,{
+ {
"path" : "pages/my/my",
"style" :
{
@@ -70,15 +28,6 @@
"enablePullDownRefresh": false
}
- }
- ,{
- "path" : "pages/uview/uview",
- "style" :
- {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": false
- }
-
}
,{
"path" : "pages/login/login",
@@ -116,786 +65,43 @@
}
}
+ ,{
+ "path" : "pages/inspectrecord/index",
+ "style" :
+ {
+ "navigationBarTitleText": "检查项目",
+ "enablePullDownRefresh": false
+ }
+
+ }
+ ,{
+ "path" : "pages/inspectrecord/recorddo",
+ "style" :
+ {
+ "navigationBarTitleText": "检查确认",
+ "enablePullDownRefresh": false
+ }
+
+ }
+ ,{
+ "path" : "pages/inspectrecord/recorddetail",
+ "style" :
+ {
+ "navigationBarTitleText": "条款详情",
+ "enablePullDownRefresh": false
+ }
+
+ }
+ ,{
+ "path" : "pages/inspectrecord/deptreport",
+ "style" :
+ {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
+ }
],
- "subPackages": [{
- "root": "pages/componentsC",
- "pages": [
- // test-测试
- {
- "path": "test/index",
- "style": {
- "navigationBarTitleText": "Test"
- // "navigationStyle": "custom" ,// 隐藏系统导航栏
- // "navigationBarTextStyle": "white" // 状态栏字体为白色
- }
- },
- // gap-间隔槽
- {
- "path": "gap/index",
- "style": {
- "navigationBarTitleText": "gap-间隔槽"
- }
- },
- // subsection分段器
- {
- "path": "subsection/index",
- "style": {
- "navigationBarTitleText": "subsection-分段器"
- }
- },
- // section 查看更多
- {
- "path": "section/index",
- "style": {
- "navigationBarTitleText": "section-查看更多"
- }
- },
- // link链接
- {
- "path": "link/index",
- "style": {
- "navigationBarTitleText": "link-链接"
- }
- },
- // mask遮罩层
- {
- "path": "mask/index",
- "style": {
- "navigationBarTitleText": "mask-遮罩层"
- }
- },
- // countTo数字滚动
- {
- "path": "countTo/index",
- "style": {
- "navigationBarTitleText": "countTo-数字滚动"
- }
- },
- // color颜色
- {
- "path": "color/index",
- "style": {
- "navigationBarTitleText": "color-颜色"
- }
- },
- // countDown倒计时
- {
- "path": "countDown/index",
- "style": {
- "navigationBarTitleText": "countDown-倒计时"
- }
- },
- // progress进度条
- {
- "path": "progress/index",
- "style": {
- "navigationBarTitleText": "progress-进度条"
- }
- },
- // alertTips警告提示
- {
- "path": "alertTips/index",
- "style": {
- "navigationBarTitleText": "alertTips-警告提示"
- }
- },
- // badge 徽标数
- {
- "path": "badge/index",
- "style": {
- "navigationBarTitleText": "badge-徽标数"
- }
- },
- // button按钮
- {
- "path": "button/index",
- "style": {
- "navigationBarTitleText": "button-按钮"
- }
- },
- // collapse折叠面板
- {
- "path": "collapse/index",
- "style": {
- "navigationBarTitleText": "collapse-折叠面板"
- }
- },
- // actionSheet操作菜单
- {
- "path": "actionSheet/index",
- "style": {
- "navigationBarTitleText": "actionSheet-操作菜单"
- }
- },
- // messageInput验证码输入
- {
- "path": "messageInput/index",
- "style": {
- "navigationBarTitleText": "messageInput-验证码输入"
- }
- },
- // popup弹窗
- {
- "path": "popup/index",
- "style": {
- "navigationBarTitleText": "popup-弹窗"
- }
- },
- // listCell
- {
- "path": "cell/index",
- "style": {
- "navigationBarTitleText": "listCell-列表"
- }
- },
- // numberBox数字输入框
- {
- "path": "numberBox/index",
- "style": {
- "navigationBarTitleText": "numberBox-步进器"
- }
- },
- // grid宫格布局
- {
- "path": "grid/index",
- "style": {
- "navigationBarTitleText": "grid-宫格布局"
- }
- },
- // layout栅格布局
- {
- "path": "layout/index",
- "style": {
- "navigationBarTitleText": "layout-栅格布局"
- }
- },
- // 加载更多
- {
- "path": "loadmore/index",
- "style": {
- "navigationBarTitleText": "loadmore-加载更多"
- }
- }
- ]
- },
- {
- "root": "pages/template",
- "pages": [
- // wxCenter 仿微信个人中心
- {
- "path": "wxCenter/index",
- "style": {
- "navigationBarTitleText": "wxCenter 仿微信个人中心",
- "navigationStyle": "custom"
- }
- },
- // keyboardPay 自定义键盘支付
- {
- "path": "keyboardPay/index",
- "style": {
- "navigationBarTitleText": "keyboardPay 自定义键盘支付"
- }
- },
- // douyin 仿抖音
- // {
- // "path": "douyin/index",
- // "style": {
- // "navigationBarTitleText": "douyin 仿抖音"
- // }
- // },
- // mallMenu商城分类
- {
- "path": "mallMenu/index2",
- "style": {
- "navigationBarTitleText": "mallMenu-商城分类"
- }
- },
- // mallMenu商城分类
- {
- "path": "mallMenu/index1",
- "style": {
- "navigationBarTitleText": "mallMenu-商城分类"
- }
- },
- // coupon优惠券
- {
- "path": "coupon/index",
- "style": {
- "navigationBarTitleText": "coupon-优惠券"
- }
- },
- {
- "path": "login/index",
- "style": {
- "navigationBarTitleText": "美团登录"
- }
- },
- // 城市选择
- {
- "path": "citySelect/index",
- "style": {
- "navigationBarTitleText": "城市选择"
- }
- },
- // SubmitBar提交订单栏
- {
- "path": "submitBar/index",
- "style": {
- "navigationBarTitleText": "提交订单栏"
- }
- },
- // comment评论
- {
- "path": "comment/index",
- "style": {
- "navigationBarTitleText": "评论"
- }
- },
- // comment评论详情
- {
- "path": "comment/reply",
- "style": {
- "navigationBarTitleText": "评论详情"
- }
- },
- // order订单
- {
- "path": "order/index",
- "style": {
- "navigationBarTitleText": "订单"
- }
- },
- // login登录获取验证码
- {
- "path": "login/code",
- "style": {
- "navigationBarTitleText": "登录获取验证码"
- }
- },
- // address用户地址
- {
- "path": "address/index",
- "style": {
- "navigationBarTitleText": "用户地址"
- }
- },
- // address添加用户地址
- {
- "path": "address/addSite",
- "style": {
- "navigationBarTitleText": "添加用户地址"
- }
- }
- ]
- },
- {
- "root": "pages/library",
- "pages": [
- // debounce-节流防抖
- {
- "path": "debounce/index",
- "style": {
- "navigationBarTitleText": "throttle | debounce-节流防抖"
- }
- },
- // deepClone-对象深度克隆
- {
- "path": "deepClone/index",
- "style": {
- "navigationBarTitleText": "deepClone-对象深度克隆"
- }
- },
- // deepMerge-对象深度合并
- {
- "path": "deepMerge/index",
- "style": {
- "navigationBarTitleText": "deepMerge-对象深度合并"
- }
- },
- // getRect-元素节点
- {
- "path": "getRect/index",
- "style": {
- "navigationBarTitleText": "getRect-元素节点"
- }
- },
- // timeFrom-多久之前
- {
- "path": "timeFrom/index",
- "style": {
- "navigationBarTitleText": "timeFrom-多久之前"
- }
- },
- // globalData-全局变量
- {
- "path": "globalVariable/globalData",
- "style": {
- "navigationBarTitleText": "globalData-全局变量"
- }
- },
- // prototype-全局变量
- {
- "path": "globalVariable/prototype",
- "style": {
- "navigationBarTitleText": "prototype-全局变量"
- }
- },
- // vuex-全局变量
- {
- "path": "globalVariable/vuex",
- "style": {
- "navigationBarTitleText": "vuex-全局变量"
- }
- },
- // globalVariable-全局变量
- {
- "path": "globalVariable/index",
- "style": {
- "navigationBarTitleText": "globalVariable-全局变量"
- }
- },
- // http-请求
- {
- "path": "http/index",
- "style": {
- "navigationBarTitleText": "http-请求"
- }
- },
- // test-规则验证
- {
- "path": "test/index",
- "style": {
- "navigationBarTitleText": "test-规则验证"
- }
- },
- // mpShare-小程序分享
- {
- "path": "mpShare/index",
- "style": {
- "navigationBarTitleText": "mpShare-小程序分享"
- }
- },
- // color-JS调用颜色
- {
- "path": "color/index",
- "style": {
- "navigationBarTitleText": "color-JS调用颜色"
- }
- },
- // trim-去除空格
- {
- "path": "trim/index",
- "style": {
- "navigationBarTitleText": "trim-去除空格"
- }
- },
- // random-随机数生成
- {
- "path": "random/index",
- "style": {
- "navigationBarTitleText": "random-随机数生成"
- }
- },
- // md5加密
- {
- "path": "md5/index",
- "style": {
- "navigationBarTitleText": "md5-加密"
- }
- },
- // colorSwitch颜色转换
- {
- "path": "colorSwitch/index",
- "style": {
- "navigationBarTitleText": "colorSwitch-颜色转换"
- }
- },
- // randomArray数组乱序
- {
- "path": "randomArray/index",
- "style": {
- "navigationBarTitleText": "randomArray-数组乱序"
- }
- },
- // guid全局唯一标识符
- {
- "path": "guid/index",
- "style": {
- "navigationBarTitleText": "guid-全局唯一标识符"
- }
- },
- // timeFormat时间格式化
- {
- "path": "timeFormat/index",
- "style": {
- "navigationBarTitleText": "timeFormat-时间格式化"
- }
- }, // route-路由
- {
- "path": "route/index",
- "style": {
- "navigationBarTitleText": "route-路由"
- }
- },
- // route-路由跳转
- {
- "path": "route/routeTo",
- "style": {
- "navigationBarTitleText": "route-路由跳转"
- }
- },
- // queryParams-对象转URL参数
- {
- "path": "queryParams/index",
- "style": {
- "navigationBarTitleText": "queryParams-对象转URL参数"
- }
- }
- ]
- },
- {
- "root": "pages/componentsA",
- "pages": [
- // parse-富文本解析器
- {
- "path": "parse/index",
- "style": {
- "navigationBarTitleText": "parse-富文本解析器"
- }
- },
- // backTop-返回顶部
- {
- "path": "backTop/index",
- "style": {
- "navigationBarTitleText": "backTop-返回顶部"
- }
- },
- // calendar-日历
- {
- "path": "calendar/index",
- "style": {
- "navigationBarTitleText": "calendar-日历"
- }
- },
- // form-表单
- {
- "path": "form/index",
- "style": {
- "navigationBarTitleText": "form-表单"
- }
- },
- // select-列选择器
- {
- "path": "select/index",
- "style": {
- "navigationBarTitleText": "select-列选择器"
- }
- },
- // slider-滑动选择器
- {
- "path": "slider/index",
- "style": {
- "navigationBarTitleText": "slider-滑动选择器"
- }
- },
- // fullScreen-压窗屏
- {
- "path": "fullScreen/index",
- "style": {
- "navigationBarTitleText": "fullScreen-压窗屏"
- }
- },
- // navbar-自定义导航栏
- {
- "path": "navbar/index",
- "style": {
- // "navigationBarTitleText": "navbar-自定义导航栏",
- "navigationStyle": "custom", // 隐藏系统导航栏
- "navigationBarTextStyle": "white" // 状态栏字体为白色
- }
- },
- // field-输入框
- {
- "path": "field/index",
- "style": {
- "navigationBarTitleText": "field-输入框"
- }
- },
- // modal-模态框
- {
- "path": "modal/index",
- "style": {
- "navigationBarTitleText": "modal-模态框"
- }
- },
- // indexList索引列表
- {
- "path": "indexList/index",
- "style": {
- "navigationBarTitleText": "indexList-索引列表"
- }
- },
- // empty内容为空
- {
- "path": "empty/index",
- "style": {
- "navigationBarTitleText": "empty-内容为空"
- }
- },
- // avatarCropper-头像裁剪
- {
- "path": "avatarCropper/index",
- "style": {
- "navigationBarTitleText": "avatarCropper-头像裁剪"
- }
- }, // noNetwork没有网络
- {
- "path": "noNetwork/index",
- "style": {
- "navigationBarTitleText": "noNetwork-没有网络"
- }
- }, // icon字体图标
- {
- "path": "icon/index",
- "style": {
- "navigationBarTitleText": "icon-字体图标"
- }
- }, // avatar-用户头像展示
- {
- "path": "avatar/index",
- "style": {
- "navigationBarTitleText": "avatar-用户头像展示"
- }
- }, // keyboard键盘
- {
- "path": "keyboard/index",
- "style": {
- "navigationBarTitleText": "keyboard-键盘"
- }
- }, // 图片懒加载
- {
- "path": "lazyLoad/index",
- "style": {
- "navigationBarTitleText": "lazyLoad-懒加载"
- }
- },
- // tabs切换
- {
- "path": "tabs/index",
- "style": {
- "navigationBarTitleText": "Tabs-切换"
- }
- },
- // tag标签
- {
- "path": "tag/index",
- "style": {
- "navigationBarTitleText": "tag-标签"
- }
- },
- // timeLine时间轴
- {
- "path": "timeLine/index",
- "style": {
- "navigationBarTitleText": "timeLine-时间轴"
- }
- },
- // toast轻提示
- {
- "path": "toast/index",
- "style": {
- "navigationBarTitleText": "toast-轻提示"
- }
- },
- // topTips消息提示
- {
- "path": "topTips/index",
- "style": {
- "navigationBarTitleText": "topTips-消息提示"
- }
- },
- // Code-验证码倒计时
- {
- "path": "verificationCode/index",
- "style": {
- "navigationBarTitleText": "Code-验证码倒计时"
- }
- }
- ]
- },
- {
- "root": "pages/componentsB",
- "pages": [
- // dropdown-下拉菜单
- {
- "path": "dropdown/index",
- "style": {
- "navigationBarTitleText": "dropdown-下拉菜单"
- }
- },
- // tabbar-底部导航栏
- {
- "path": "tabbar/index",
- "style": {
- "navigationBarTitleText": "tabbar-底部导航栏"
- }
- },
- // line-线条
- {
- "path": "line/index",
- "style": {
- "navigationBarTitleText": "line-线条"
- }
- },
- // image-图片
- {
- "path": "image/index",
- "style": {
- "navigationBarTitleText": "image-图片"
- }
- },
- // card-卡片
- {
- "path": "card/index",
- "style": {
- "navigationBarTitleText": "card-卡片"
- }
- },
- // divider-分割线
- {
- "path": "divider/index",
- "style": {
- "navigationBarTitleText": "divider-分割线"
- }
- },
- // picker选择器
- {
- "path": "picker/index",
- "style": {
- "navigationBarTitleText": "picker-选择器"
- }
- }, // noticeBar通告栏
- {
- "path": "noticeBar/index",
- "style": {
- "navigationBarTitleText": "noticeBar-通告栏"
- }
- },
- // checkbox-复选框
- {
- "path": "checkbox/index",
- "style": {
- "navigationBarTitleText": "checkbox-复选框"
- }
- },
- // radio-单选框
- {
- "path": "radio/index",
- "style": {
- "navigationBarTitleText": "radio-单选框"
- }
- },
- // loading-加载动画
- {
- "path": "loading/index",
- "style": {
- "navigationBarTitleText": "loading-加载动画"
- }
- },
- // switch-开关选择器
- {
- "path": "switch/index",
- "style": {
- "navigationBarTitleText": "switch-开关选择器"
- }
- },
- // 骨架屏
- {
- "path": "skeleton/index",
- "style": {
- "navigationBarTitleText": "skeleton-骨架屏"
- }
- }, // upload上传
- {
- "path": "upload/index",
- "style": {
- "navigationBarTitleText": "upload-上传"
- }
- },
- // waterfall瀑布流
- // #ifndef MP-TOUTIAO
- {
- "path": "waterfall/index",
- "style": {
- "navigationBarTitleText": "waterfall-瀑布流"
- }
- },
- // #endif
- // table表格
- {
- "path": "table/index",
- "style": {
- "navigationBarTitleText": "table-表格"
- }
- },
- // rate评分
- {
- "path": "rate/index",
- "style": {
- "navigationBarTitleText": "rate-评分"
- }
- },
- // readMore显示更多
- {
- "path": "readMore/index",
- "style": {
- "navigationBarTitleText": "readMore-查看更多"
- }
- },
- // search搜索框
- {
- "path": "search/index",
- "style": {
- "navigationBarTitleText": "search-搜索框"
- }
- },
- // steps步骤条
- {
- "path": "steps/index",
- "style": {
- "navigationBarTitleText": "steps-步骤条"
- }
- },
- // sticky吸顶
- {
- "path": "sticky/index",
- "style": {
- "navigationBarTitleText": "sticky-吸顶"
- }
- },
- // swiper轮播图
- {
- "path": "swiper/index",
- "style": {
- "navigationBarTitleText": "swiper-轮播图"
- }
- },
- // swipeAction-左滑删除
- {
- "path": "swipeAction/index",
- "style": {
- "navigationBarTitleText": "swipeAction-左滑删除"
- }
- }
- ]
- }
- ],
- "preloadRule": {
- "pages/example/components": {
- "network": "all",
- "packages": ["pages/componentsA", "pages/componentsB", "pages/componentsC"]
- }
- },
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "uView",
diff --git a/client_mp/pages/componentsA/avatar/index.vue b/client_mp/pages/componentsA/avatar/index.vue
deleted file mode 100644
index d10e1a0..0000000
--- a/client_mp/pages/componentsA/avatar/index.vue
+++ /dev/null
@@ -1,90 +0,0 @@
-
-
-
- 演示效果
-
-
-
-
-
-
- 参数配置
-
-
- 模式选择
-
-
-
- 性别选择
-
-
-
- 等级
-
-
-
- 自定义内容
-
-
-
- 尺寸
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsA/avatarCropper/index.vue b/client_mp/pages/componentsA/avatarCropper/index.vue
deleted file mode 100644
index 8347e97..0000000
--- a/client_mp/pages/componentsA/avatarCropper/index.vue
+++ /dev/null
@@ -1,110 +0,0 @@
-
-
-
- 演示效果
-
-
-
-
-
- 选择图片
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsA/backTop/index.vue b/client_mp/pages/componentsA/backTop/index.vue
deleted file mode 100644
index 351f8ea..0000000
--- a/client_mp/pages/componentsA/backTop/index.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-
-
-
- 演示效果
-
- 滚动页面即可在右下角看到返回顶部的按钮
-
-
-
-
-
-
- 参数配置
-
-
- 模式
-
-
-
- 组件位置
-
-
-
- 显示组件的滚动条距离
-
-
-
- 自定义样式
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsA/calendar/index.vue b/client_mp/pages/componentsA/calendar/index.vue
deleted file mode 100644
index e28cce5..0000000
--- a/client_mp/pages/componentsA/calendar/index.vue
+++ /dev/null
@@ -1,111 +0,0 @@
-
-
-
- 演示效果
-
-
-
-
- {{result}}
-
-
-
-
-
- 参数配置
-
-
- 状态
-
-
-
- 模式
-
-
-
- 自定义样式
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsA/empty/index.vue b/client_mp/pages/componentsA/empty/index.vue
deleted file mode 100644
index 06bdff8..0000000
--- a/client_mp/pages/componentsA/empty/index.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
-
- 演示效果
-
-
-
- slot按钮
-
-
-
-
-
-
- 参数配置
-
-
- 模式选择
-
-
-
- 购物车为空
-
-
- 页面不存在
-
-
- 没有搜索结果
-
-
-
-
- 没有收货地址
-
-
- 没有WiFi
-
-
- 订单为空
-
-
-
-
- 没有优惠券
-
-
- 没有收藏
-
-
- 无权限
-
-
-
-
- 无历史记录
-
-
- 无新闻列表
-
-
- 消息列表为空
-
-
-
-
- 列表为空
-
-
- 数据为空
-
-
- 待扩展
-
-
-
-
-
- 传入slot
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsA/field/index.vue b/client_mp/pages/componentsA/field/index.vue
deleted file mode 100644
index 5283d62..0000000
--- a/client_mp/pages/componentsA/field/index.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-
-
-
- 演示效果
-
-
-
-
- 发送验证码
-
-
-
-
-
- 参数配置
-
-
- 右侧按钮
-
-
-
- 显示错误信息
-
-
-
- 是否必填
-
-
-
- 显示左图标和右箭头
-
-
-
- 第一个输入框为textarea类型
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsA/form/index.vue b/client_mp/pages/componentsA/form/index.vue
deleted file mode 100644
index 3b3b602..0000000
--- a/client_mp/pages/componentsA/form/index.vue
+++ /dev/null
@@ -1,454 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.name }}
-
-
-
-
- {{ item.name }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{codeTips}}
-
-
-
-
-
-
-
-
-
-
-
-
- 勾选代表同意uView的版权协议
-
-
- 提交
-
-
-
-
-
-
- 参数配置
-
-
- label对齐方式
-
-
-
- 边框
-
-
-
- radio、checkbox样式
-
-
-
- 错误提示方式
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsA/fullScreen/index.vue b/client_mp/pages/componentsA/fullScreen/index.vue
deleted file mode 100644
index 5e483a1..0000000
--- a/client_mp/pages/componentsA/fullScreen/index.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
- 演示效果
-
-
- 通过压窗屏打开的模态框,可以遮盖顶部原生的导航栏和底部tabbar栏。
- 注意:压窗屏只对APP有效,其他端无效。
-
-
-
-
-
- 参数配置
-
-
- 状态
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsA/icon/index.vue b/client_mp/pages/componentsA/icon/index.vue
deleted file mode 100644
index 5a65f08..0000000
--- a/client_mp/pages/componentsA/icon/index.vue
+++ /dev/null
@@ -1,652 +0,0 @@
-
-
-
-
-
- {{item.name}}
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsA/indexList/index.vue b/client_mp/pages/componentsA/indexList/index.vue
deleted file mode 100644
index 18c1f25..0000000
--- a/client_mp/pages/componentsA/indexList/index.vue
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
- {{item1.name}}
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsA/keyboard/index.vue b/client_mp/pages/componentsA/keyboard/index.vue
deleted file mode 100644
index 017c6cb..0000000
--- a/client_mp/pages/componentsA/keyboard/index.vue
+++ /dev/null
@@ -1,113 +0,0 @@
-
-
-
- 演示效果
-
-
-
- 清空
-
-
-
-
-
-
- 参数配置
-
-
- 键盘开关
-
-
-
- 键盘类型
-
-
-
- 打乱顺序
-
-
-
- 上方工具条
-
-
-
- 是否显示遮罩
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsA/lazyLoad/index.vue b/client_mp/pages/componentsA/lazyLoad/index.vue
deleted file mode 100644
index bed40e5..0000000
--- a/client_mp/pages/componentsA/lazyLoad/index.vue
+++ /dev/null
@@ -1,253 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsA/modal/index.vue b/client_mp/pages/componentsA/modal/index.vue
deleted file mode 100644
index 8532649..0000000
--- a/client_mp/pages/componentsA/modal/index.vue
+++ /dev/null
@@ -1,91 +0,0 @@
-
-
-
- 演示效果
-
-
- 请点击弹出弹窗查看效果
-
-
-
-
-
-
-
-
-
-
- 参数配置
-
- 状态
-
-
-
- 是否显示标题
-
-
-
-
- 自定义内容
-
-
-
-
- 异步关闭
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsA/navbar/index.vue b/client_mp/pages/componentsA/navbar/index.vue
deleted file mode 100644
index a7fed0f..0000000
--- a/client_mp/pages/componentsA/navbar/index.vue
+++ /dev/null
@@ -1,258 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 轻舟已过万重山
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 演示效果
-
-
- 查看顶部导航栏效果
-
-
-
-
- 参数配置
-
-
- 标题长度
-
-
-
- 隐藏左侧返回区域
-
-
-
- 自定义左侧内容
-
-
-
- 自定义右侧内容
-
-
-
- 传入整体slot
-
-
-
- 完全自定义传入内容
-
-
-
- 背景色
-
-
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsA/noNetwork/index.vue b/client_mp/pages/componentsA/noNetwork/index.vue
deleted file mode 100644
index d5a2408..0000000
--- a/client_mp/pages/componentsA/noNetwork/index.vue
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
- 演示效果
-
- 请断开手机的WiFi和移动数据来查看效果
-
-
-
-
-
- 参数配置
-
-
- 自定义提示语
-
-
-
- 自定义图标
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/client_mp/pages/componentsA/parse/index.vue b/client_mp/pages/componentsA/parse/index.vue
deleted file mode 100644
index f93ff4a..0000000
--- a/client_mp/pages/componentsA/parse/index.vue
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsA/select/index.vue b/client_mp/pages/componentsA/select/index.vue
deleted file mode 100644
index 5755f3a..0000000
--- a/client_mp/pages/componentsA/select/index.vue
+++ /dev/null
@@ -1,211 +0,0 @@
-
-
-
- 演示效果
-
-
- select值:{{ result }}
-
-
-
- 参数配置
-
- 状态
-
-
-
- 模式
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsA/slider/index.vue b/client_mp/pages/componentsA/slider/index.vue
deleted file mode 100644
index 2a08c18..0000000
--- a/client_mp/pages/componentsA/slider/index.vue
+++ /dev/null
@@ -1,127 +0,0 @@
-
-
-
- 演示效果
-
-
-
-
-
-
- {{value}}
-
-
-
-
-
- 滑块值:{{value}}
-
-
-
-
- 参数配置
-
- 自定义颜色
-
-
-
-
- 自定义传入内容
-
-
-
-
- 自定义尺寸
-
-
-
- 步进值
-
-
-
- 最大最小值
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsA/tabs/index.vue b/client_mp/pages/componentsA/tabs/index.vue
deleted file mode 100644
index 8ccdb76..0000000
--- a/client_mp/pages/componentsA/tabs/index.vue
+++ /dev/null
@@ -1,147 +0,0 @@
-
-
-
- 演示效果
-
-
-
-
-
-
-
- 参数配置
-
-
- 模式选择
-
-
-
- 标签个数(非滚动模式)
-
-
-
- 活动选项字颜色
-
-
-
- 字体加粗
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsA/tag/index.vue b/client_mp/pages/componentsA/tag/index.vue
deleted file mode 100644
index a890f5b..0000000
--- a/client_mp/pages/componentsA/tag/index.vue
+++ /dev/null
@@ -1,91 +0,0 @@
-
-
-
- 演示效果
-
-
-
-
-
-
- 参数配置
-
- 模式选择
-
-
-
- 显示内容
-
-
-
- 主题选择
-
-
-
- 形状
-
-
-
- 尺寸
-
-
-
- 关闭图标
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsA/test/index.vue b/client_mp/pages/componentsA/test/index.vue
deleted file mode 100644
index 0748679..0000000
--- a/client_mp/pages/componentsA/test/index.vue
+++ /dev/null
@@ -1,90 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.name }}
-
-
-
-
-
-
- {{ item.name }}
-
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsA/timeLine/index.vue b/client_mp/pages/componentsA/timeLine/index.vue
deleted file mode 100644
index e8435b8..0000000
--- a/client_mp/pages/componentsA/timeLine/index.vue
+++ /dev/null
@@ -1,144 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- 待取件
- [自提柜]您的快件已放在楼下侧门,直走前方53.6米,左拐约10步,再右拐直走,见一红灯笼停下,叩门三下,喊“芝麻开门”即可。
- 2019-05-08 12:12
-
-
-
-
-
-
-
-
-
-
-
- 派送中
- 【深圳市】快件已到达目的地,派件员为国产锦衣卫007号,电话:13833882438,请留意快递信息
- 2019-05-08 06:03
-
-
-
-
-
-
-
-
-
-
-
- 运输中
- 【深圳市】快递已到达 深圳固戍一部
- 2019-05-07 08:05
-
-
-
-
-
-
- 【深圳市】快件已从深圳运转中心发出,正在发往深圳宝安一部
- 2019-12-06 22:30
-
-
-
-
-
-
- 【深圳市】快件已到达 深圳运转中心
- 2019-12-04 16:42
-
-
-
-
-
-
- 【郑州市】快件已从郑州运转中心出发,正在发往深圳运转中心
- 2019-12-02 12:55
-
-
-
-
-
-
- 【郑州市】快件已到达 郑州运转中心
- 2019-12-02 08:23
-
-
-
-
-
-
-
-
-
-
-
- 您购买的商品【尚方宝剑,先斩后奏】,经由北京军区仓库发货,国内快递承运人【中南海保镖】。
- 2019-12-01 07:00
-
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsA/toast/index.vue b/client_mp/pages/componentsA/toast/index.vue
deleted file mode 100644
index b5a250e..0000000
--- a/client_mp/pages/componentsA/toast/index.vue
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
- 演示效果
-
-
- 见弹出toast
-
-
-
-
- 参数配置
-
-
- 主题
-
-
-
- 结束后自动跳转
-
-
-
- 位置
-
-
-
- 显示图标
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsA/topTips/index.vue b/client_mp/pages/componentsA/topTips/index.vue
deleted file mode 100644
index 1037410..0000000
--- a/client_mp/pages/componentsA/topTips/index.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
- 演示效果
-
-
- 点击参数配置查看效果
-
-
-
-
- 参数配置
-
-
- 主题选择
-
-
-
- 显示时间
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/client_mp/pages/componentsA/verificationCode/index.vue b/client_mp/pages/componentsA/verificationCode/index.vue
deleted file mode 100644
index f899def..0000000
--- a/client_mp/pages/componentsA/verificationCode/index.vue
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
- 演示效果
-
-
-
- {{tips}}
- 重置
-
-
-
-
- 参数配置
-
-
- 倒计时间
-
-
-
- 自定义提示语
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsB/card/index.vue b/client_mp/pages/componentsB/card/index.vue
deleted file mode 100644
index f949f07..0000000
--- a/client_mp/pages/componentsB/card/index.vue
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-
-
-
-
-
- 瓶身描绘的牡丹一如你初妆,冉冉檀香透过窗心事我了然,宣纸上走笔至此搁一半
-
-
-
-
-
- 釉色渲染仕女图韵味被私藏,而你嫣然的一笑如含苞待放
-
-
-
-
-
-
-
-
-
-
-
- 参数配置
-
-
- 左上角图标
-
-
-
- 内边距
-
-
-
- 底部
-
-
-
- 外边框
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsB/checkbox/index.vue b/client_mp/pages/componentsB/checkbox/index.vue
deleted file mode 100644
index 0249d54..0000000
--- a/client_mp/pages/componentsB/checkbox/index.vue
+++ /dev/null
@@ -1,161 +0,0 @@
-
-
-
- 演示效果
-
-
-
- {{item.name}}
-
-
-
- {{result.length ? `选中了"${getResult}"` : '请选择'}}
-
-
-
-
-
- 参数配置
-
-
- 形状
-
-
-
- 整体大小(单位rpx)
-
-
-
- 激活颜色
-
-
-
- 默认选中第一个
-
-
-
- 每个占一行
-
-
-
- 每个宽度50%
-
-
-
- 最大选择数量
-
-
-
- 禁用第一个
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsB/divider/index.vue b/client_mp/pages/componentsB/divider/index.vue
deleted file mode 100644
index 95868f3..0000000
--- a/client_mp/pages/componentsB/divider/index.vue
+++ /dev/null
@@ -1,81 +0,0 @@
-
-
-
- 演示效果
-
- {{text}}
-
-
-
-
- 参数配置
-
-
- 提示内容
-
-
-
- 单边线宽
-
-
-
- 横线颜色
-
-
-
- 内容样式
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsB/dropdown/index.vue b/client_mp/pages/componentsB/dropdown/index.vue
deleted file mode 100644
index bbf1fc7..0000000
--- a/client_mp/pages/componentsB/dropdown/index.vue
+++ /dev/null
@@ -1,167 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- {{item.label}}
-
-
- 确定
-
-
-
-
-
-
-
- 参数配置
-
-
- 下边框
-
-
-
- 激活颜色
-
-
-
- 遮罩是否可点击
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsB/image/index.vue b/client_mp/pages/componentsB/image/index.vue
deleted file mode 100644
index c2c4b91..0000000
--- a/client_mp/pages/componentsB/image/index.vue
+++ /dev/null
@@ -1,96 +0,0 @@
-
-
-
- 演示效果
-
-
-
- 加载失败
-
-
-
-
- 参数配置
-
- 状态
-
-
-
-
-
- 加载中状态
-
-
-
-
- 加载失败状态
-
-
-
- 形状
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsB/line/index.vue b/client_mp/pages/componentsB/line/index.vue
deleted file mode 100644
index 9615c80..0000000
--- a/client_mp/pages/componentsB/line/index.vue
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-
- 演示效果
-
-
-
-
-
-
-
- 参数配置
-
-
- 颜色
-
-
-
- 线条类型
-
-
-
- 细边
-
-
-
- 方向
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsB/loading/index.vue b/client_mp/pages/componentsB/loading/index.vue
deleted file mode 100644
index 771fecd..0000000
--- a/client_mp/pages/componentsB/loading/index.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
- 演示效果
-
-
-
-
-
-
- 参数配置
-
-
- 模式
-
-
-
- 颜色(只对圆圈模式有效)
-
-
-
- 尺寸(单位rpx)
-
-
-
- 是否显示
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsB/noticeBar/index.vue b/client_mp/pages/componentsB/noticeBar/index.vue
deleted file mode 100644
index 1344ee3..0000000
--- a/client_mp/pages/componentsB/noticeBar/index.vue
+++ /dev/null
@@ -1,144 +0,0 @@
-
-
-
- 演示效果
-
-
-
-
-
-
-
- 参数配置
-
-
- 主题
-
-
-
- 滚动模式
-
-
-
- 是否衔接(水平模式有效)
-
-
-
- 状态
-
-
-
- 速度
-
-
-
- 图标
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsB/picker/index.vue b/client_mp/pages/componentsB/picker/index.vue
deleted file mode 100644
index bf4574f..0000000
--- a/client_mp/pages/componentsB/picker/index.vue
+++ /dev/null
@@ -1,199 +0,0 @@
-
-
-
- 演示效果
-
- {{ input ? input : 'Picker值' }}
-
-
-
-
- 参数配置
-
- Picker开关
-
-
-
- 模式选择
-
-
-
- 默认时间
-
-
-
- 显示时分秒
-
-
-
- 默认地区
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsB/radio/index.vue b/client_mp/pages/componentsB/radio/index.vue
deleted file mode 100644
index 121f29a..0000000
--- a/client_mp/pages/componentsB/radio/index.vue
+++ /dev/null
@@ -1,142 +0,0 @@
-
-
-
- 演示效果
-
-
-
- {{item.name}}
-
-
-
- {{value ? `选中了"${result}"` : '请选择'}}
-
-
-
-
-
- 参数配置
-
-
- 形状
-
-
-
- 整体大小(单位rpx)
-
-
-
- 激活颜色
-
-
-
- 每个占一行
-
-
-
- 每个宽度50%
-
-
-
- 默认选中第一个
-
-
-
- 禁用第一个
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsB/rate/index.vue b/client_mp/pages/componentsB/rate/index.vue
deleted file mode 100644
index 04827e2..0000000
--- a/client_mp/pages/componentsB/rate/index.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-
-
-
- 演示效果
-
-
-
-
-
-
- 参数配置
-
-
- 初始值
-
-
-
- 镂空状态
-
-
-
- 自定义样式
-
-
-
- 自定义图标
-
-
-
- 是否分层
-
-
-
- 是否禁用
-
-
-
- 星星数量
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsB/readMore/index.vue b/client_mp/pages/componentsB/readMore/index.vue
deleted file mode 100644
index b15cf66..0000000
--- a/client_mp/pages/componentsB/readMore/index.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
- 演示效果
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 参数配置
-
-
- 超出高度隐藏
-
-
-
- 展开后可关闭
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/client_mp/pages/componentsB/search/index.vue b/client_mp/pages/componentsB/search/index.vue
deleted file mode 100644
index a6b108a..0000000
--- a/client_mp/pages/componentsB/search/index.vue
+++ /dev/null
@@ -1,96 +0,0 @@
-
-
-
- 演示效果
-
-
-
-
-
-
-
- 参数配置
-
-
- 初始值
-
-
-
- 搜索框形状
-
-
-
- 清除控件
-
-
-
- 右侧控件
-
-
-
- 水平对齐方式
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsB/skeleton/index.vue b/client_mp/pages/componentsB/skeleton/index.vue
deleted file mode 100644
index a0dc027..0000000
--- a/client_mp/pages/componentsB/skeleton/index.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-
-
-
- 演示效果
-
-
-
-
-
-
-
-
- {{userInfo.nickName}}
-
-
-
-
-
- {{item}}
-
-
-
-
-
-
-
-
-
- 参数配置
-
-
- 加载状态
-
-
-
- 骨架动画
-
-
-
- 自定义样式
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsB/steps/index.vue b/client_mp/pages/componentsB/steps/index.vue
deleted file mode 100644
index e6b65ba..0000000
--- a/client_mp/pages/componentsB/steps/index.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
- 演示效果
-
-
-
-
-
-
- 参数配置
-
-
- 模式
-
-
-
- 方向
-
-
-
- 自定义图标
-
-
-
- 当前步值
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsB/sticky/index.vue b/client_mp/pages/componentsB/sticky/index.vue
deleted file mode 100644
index 4f79385..0000000
--- a/client_mp/pages/componentsB/sticky/index.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
-
- 演示效果
-
-
-
-
- 宝剑锋从磨砺出,梅花香自苦寒来
-
-
-
-
-
-
- 参数配置
-
-
- 吸顶高度
-
-
-
- 状态
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsB/swipeAction/index.vue b/client_mp/pages/componentsB/swipeAction/index.vue
deleted file mode 100644
index 285bb04..0000000
--- a/client_mp/pages/componentsB/swipeAction/index.vue
+++ /dev/null
@@ -1,153 +0,0 @@
-
-
-
- 演示效果
-
-
-
-
-
-
-
- {{ item.title }}
-
-
-
-
-
-
- 参数配置
-
- 状态(操作第一个)
-
-
-
- 禁止滑动
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsB/swiper/index.vue b/client_mp/pages/componentsB/swiper/index.vue
deleted file mode 100644
index 87b21af..0000000
--- a/client_mp/pages/componentsB/swiper/index.vue
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
- 演示效果
-
-
-
-
-
-
-
- 参数配置
-
-
- 指示器模式
-
-
-
- 标题
-
-
-
- 指示器位置
-
-
-
- 3D效果
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsB/switch/index.vue b/client_mp/pages/componentsB/switch/index.vue
deleted file mode 100644
index e0a573d..0000000
--- a/client_mp/pages/componentsB/switch/index.vue
+++ /dev/null
@@ -1,113 +0,0 @@
-
-
-
- 演示效果
-
-
-
-
-
-
- 参数配置
-
-
- 状态
-
-
-
- 颜色
-
-
-
- 尺寸(单位rpx)
-
-
-
- 加载中
-
-
-
- 禁用
-
-
-
- 异步控制
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsB/tabbar/index.vue b/client_mp/pages/componentsB/tabbar/index.vue
deleted file mode 100644
index 797c447..0000000
--- a/client_mp/pages/componentsB/tabbar/index.vue
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-
-
-
- 参数配置
-
-
- 状态
-
-
-
- 凸起按钮
-
-
-
- 背景色
-
-
-
- 顶部边框
-
-
-
- 提示角标
-
-
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsB/table/index.vue b/client_mp/pages/componentsB/table/index.vue
deleted file mode 100644
index f4dcc39..0000000
--- a/client_mp/pages/componentsB/table/index.vue
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
- 演示效果
-
-
-
-
- 姓名
- 年龄
- 籍贯
- 性别
-
-
- 吕布
- 22
- 楚河
- 男
-
-
- 项羽
- 28
- 汉界
- 男
-
-
- 木兰
- 24
- 南国
- 女
-
-
-
-
-
-
- 参数配置
-
-
- 边框颜色
-
-
-
- 对齐方式
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsB/upload/index.vue b/client_mp/pages/componentsB/upload/index.vue
deleted file mode 100644
index 158b8a3..0000000
--- a/client_mp/pages/componentsB/upload/index.vue
+++ /dev/null
@@ -1,224 +0,0 @@
-
-
-
- 演示效果
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 上传
- 清空列表
-
-
-
-
-
- 参数配置
-
-
- 上传方式
-
-
-
- 自定义控件(进度条和删除按钮)
-
-
-
- 最大上传数量
-
-
-
- 自定义样式(预览区域和上传按钮)
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsB/waterfall/index.vue b/client_mp/pages/componentsB/waterfall/index.vue
deleted file mode 100644
index e7d4ce8..0000000
--- a/client_mp/pages/componentsB/waterfall/index.vue
+++ /dev/null
@@ -1,224 +0,0 @@
-
-
-
-
-
-
-
- {{ item.title }}
- {{ item.price }}元
-
- 自营
- 放心购
-
- {{ item.shop }}
-
-
-
-
-
-
-
-
- {{ item.title }}
- {{ item.price }}元
-
- 自营
- 放心购
-
- {{ item.shop }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsC/actionSheet/index.vue b/client_mp/pages/componentsC/actionSheet/index.vue
deleted file mode 100644
index 9bceb8c..0000000
--- a/client_mp/pages/componentsC/actionSheet/index.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
- 演示效果
-
-
- 唤起ActionSheet
-
-
-
-
-
- 参数配置
-
-
- 取消按钮
-
-
-
- 点击遮罩关闭
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsC/alertTips/index.vue b/client_mp/pages/componentsC/alertTips/index.vue
deleted file mode 100644
index af9fec0..0000000
--- a/client_mp/pages/componentsC/alertTips/index.vue
+++ /dev/null
@@ -1,90 +0,0 @@
-
-
-
- 演示效果
-
-
-
-
-
-
-
- 参数配置
-
-
- 左侧图标
-
-
-
- 关闭图标
-
-
-
- 主题
-
-
-
- 状态
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsC/badge/index.vue b/client_mp/pages/componentsC/badge/index.vue
deleted file mode 100644
index 702a065..0000000
--- a/client_mp/pages/componentsC/badge/index.vue
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
- 演示效果
-
-
-
-
-
- 参数配置
-
- 数值显示
-
-
-
- 主题选择
-
-
-
- 显示点
-
-
-
- 尺寸
-
-
-
- 位置偏移
-
-
-
- 中心点与父右上角重合
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsC/button/index.vue b/client_mp/pages/componentsC/button/index.vue
deleted file mode 100644
index e347336..0000000
--- a/client_mp/pages/componentsC/button/index.vue
+++ /dev/null
@@ -1,121 +0,0 @@
-
-
-
- 演示效果
-
- 山川异域,风月同天
-
-
-
-
- 参数配置
-
-
- 主题选择
-
-
-
- 尺寸大小
-
-
-
- 形状
-
-
-
- 镂空
-
-
-
- 水波纹(感觉哪里有问题?点击顶部的按钮试试)
-
-
-
- 细边框
-
-
-
- 加载中
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsC/cell/index.vue b/client_mp/pages/componentsC/cell/index.vue
deleted file mode 100644
index a81e802..0000000
--- a/client_mp/pages/componentsC/cell/index.vue
+++ /dev/null
@@ -1,113 +0,0 @@
-
-
-
- 演示效果
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 参数配置
-
-
- 更换图标
-
-
-
-
-
- 自定义右侧内容
-
-
-
-
- 描述信息
-
-
-
- 更换标题
-
-
-
- 右侧箭头
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsC/circleProgress/index.vue b/client_mp/pages/componentsC/circleProgress/index.vue
deleted file mode 100644
index ed1e7f1..0000000
--- a/client_mp/pages/componentsC/circleProgress/index.vue
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
-
-
- 查找中
-
-
-
-
-
- 查找中
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsC/collapse/index.vue b/client_mp/pages/componentsC/collapse/index.vue
deleted file mode 100644
index 26c939a..0000000
--- a/client_mp/pages/componentsC/collapse/index.vue
+++ /dev/null
@@ -1,142 +0,0 @@
-
-
-
- 演示效果
-
-
-
-
- {{item.body}}
-
-
-
-
-
-
- 参数配置
-
-
- 手风琴模式
-
-
-
- 右侧箭头
-
-
-
- 自定义样式
-
-
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsC/color/index.vue b/client_mp/pages/componentsC/color/index.vue
deleted file mode 100644
index 01c9fc0..0000000
--- a/client_mp/pages/componentsC/color/index.vue
+++ /dev/null
@@ -1,364 +0,0 @@
-
-
-
-
- 主色调
-
-
-
-
- Primary
-
-
- #2979ff
-
-
-
-
- Dark
-
-
- #2b85e4
-
-
-
-
- Disabled
-
-
- #a0cfff
-
-
-
-
- Light
-
-
- #ecf5ff
-
-
-
-
-
-
- Error
-
-
-
-
- Error
-
-
- #fa3534
-
-
-
-
- Dark
-
-
- #dd6161
-
-
-
-
- Disabled
-
-
- #fab6b6
-
-
-
-
- Light
-
-
- #fef0f0
-
-
-
-
-
-
- Warning
-
-
-
-
- Warning
-
-
- #ff9900
-
-
-
-
- Dark
-
-
- #f29100
-
-
-
-
- Disabled
-
-
- #fcbd71
-
-
-
-
- Light
-
-
- #fdf6ec
-
-
-
-
-
-
- Info
-
-
-
-
- Info
-
-
- #909399
-
-
-
-
- Dark
-
-
- #82848a
-
-
-
-
- Disabled
-
-
- #c8c9cc
-
-
-
-
- Light
-
-
- #f4f4f5
-
-
-
-
-
-
- Success
-
-
-
-
- Success
-
-
- #19be6b
-
-
-
-
- Dark
-
-
- #18b566
-
-
-
-
- Disabled
-
-
- #71d5a1
-
-
-
-
- Light
-
-
- #dbf1e1
-
-
-
-
-
-
- 文字颜色
-
-
-
-
- 主要文字
-
-
- #303133
-
-
-
-
- 常规文字
-
-
- #606266
-
-
-
-
- 次要文字
-
-
- #909399
-
-
-
-
- 占位文字
-
-
- #c0c4cc
-
-
-
-
-
-
- 边框颜色
-
-
-
-
- 一级边框
-
-
- #dcdfe6
-
-
-
-
- 二级边框
-
-
- #e4e7ed
-
-
-
-
- 三级边框
-
-
- #ebeef5
-
-
-
-
- 四级边框
-
-
- #f2f6fc
-
-
-
-
-
-
- 背景颜色
-
-
-
-
- 背景颜色
-
-
- #f3f4f6
-
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsC/countDown/index.vue b/client_mp/pages/componentsC/countDown/index.vue
deleted file mode 100644
index 3b98928..0000000
--- a/client_mp/pages/componentsC/countDown/index.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-
-
-
- 演示效果
-
-
-
-
-
-
-
- 参数配置
-
-
- 调整时间
-
-
-
- 分隔符
-
-
-
- 自定义样式
-
-
-
- 显示天
-
-
-
- 字体大小
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsC/countTo/index.vue b/client_mp/pages/componentsC/countTo/index.vue
deleted file mode 100644
index e78d3a6..0000000
--- a/client_mp/pages/componentsC/countTo/index.vue
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-
- 演示效果
-
-
- 如果使用text-align: center对齐,数字滚动期间可能会抖动,见文档说明
-
-
-
-
-
-
- 参数配置
-
- 状态
-
-
-
- 目标值
-
-
-
- 滚动时间
-
-
-
- 显示小数
-
-
-
- 字体加粗
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsC/gap/index.vue b/client_mp/pages/componentsC/gap/index.vue
deleted file mode 100644
index c998bb7..0000000
--- a/client_mp/pages/componentsC/gap/index.vue
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
-
- 演示效果
-
-
-
-
-
- 参数配置
-
- 背景颜色
-
-
-
- 高度
-
-
-
- 上下外边距
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsC/grid/index.vue b/client_mp/pages/componentsC/grid/index.vue
deleted file mode 100644
index b92b47b..0000000
--- a/client_mp/pages/componentsC/grid/index.vue
+++ /dev/null
@@ -1,180 +0,0 @@
-
-
-
- 演示效果
-
-
-
-
-
-
- 图片
-
-
-
- 锁头
-
-
-
-
- 沙漏
-
-
-
- 首页
-
-
-
- 星星
-
-
-
- 音量
-
-
-
-
- 回收站
-
-
-
- 快进
-
-
-
- 购物车
-
-
-
-
-
-
-
- {{ '宫格' + (index + 1) }}
-
-
-
-
-
-
-
- {{ '宫格' + (index + 1) }}
-
-
-
-
-
-
-
- {{ '宫格' + (index + 1) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 参数配置
-
-
- 是否显示边框
-
-
-
- 是否可滑动
-
-
-
- 修改列数
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsC/layout/index.vue b/client_mp/pages/componentsC/layout/index.vue
deleted file mode 100644
index 1a63861..0000000
--- a/client_mp/pages/componentsC/layout/index.vue
+++ /dev/null
@@ -1,145 +0,0 @@
-
-
-
- 演示效果
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 参数配置
-
-
- 每个栅格占用栏数(演示共3个栅格)
-
-
-
- 分栏偏移
-
-
-
-
- 水平排列方式(微信小程序无效)
-
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsC/link/index.vue b/client_mp/pages/componentsC/link/index.vue
deleted file mode 100644
index dc0928f..0000000
--- a/client_mp/pages/componentsC/link/index.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
- 演示效果
-
- 点此链接,跳转uView官网
-
-
-
-
- 参数配置
-
-
- 下划线
-
-
-
- 自定义样式
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsC/loadmore/index.vue b/client_mp/pages/componentsC/loadmore/index.vue
deleted file mode 100644
index 3df8c5f..0000000
--- a/client_mp/pages/componentsC/loadmore/index.vue
+++ /dev/null
@@ -1,96 +0,0 @@
-
-
-
- 演示效果
-
-
-
-
-
-
-
- 参数配置
-
-
- 模式选择
-
-
-
- 自定义提示语
-
-
-
- 加载中图标样式
-
-
-
- 没有更多时用点替代
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/client_mp/pages/componentsC/mask/index.vue b/client_mp/pages/componentsC/mask/index.vue
deleted file mode 100644
index d0e7750..0000000
--- a/client_mp/pages/componentsC/mask/index.vue
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
- 演示效果
-
-
-
- 请点击弹出遮罩查看效果
-
-
-
-
-
-
-
-
-
-
- 参数配置
-
-
- 状态
-
-
-
- 缩放效果
-
-
-
- 内容填充
-
-
-
- 动画时长(ms)
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsC/messageInput/index.vue b/client_mp/pages/componentsC/messageInput/index.vue
deleted file mode 100644
index fd2334a..0000000
--- a/client_mp/pages/componentsC/messageInput/index.vue
+++ /dev/null
@@ -1,97 +0,0 @@
-
-
-
- 演示效果
-
-
-
-
-
-
-
- 参数配置
-
-
- 模式选择
-
-
-
- 输入长度
-
-
-
-
- 初始值(为满足演示需要,微信小程序切换会有抖动,非性能问题)
-
-
- 初始值
-
-
-
-
- 呼吸灯效果
-
-
-
- 是否加粗
-
-
-
- 点替代输入值
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsC/numberBox/index.vue b/client_mp/pages/componentsC/numberBox/index.vue
deleted file mode 100644
index e2a677a..0000000
--- a/client_mp/pages/componentsC/numberBox/index.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
- 演示效果
-
-
-
-
-
-
- 参数配置
-
-
- 初始值
-
-
-
- 自定义样式
-
-
-
- 是否禁用
-
-
-
- 步进值
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsC/popup/index.vue b/client_mp/pages/componentsC/popup/index.vue
deleted file mode 100644
index 2763379..0000000
--- a/client_mp/pages/componentsC/popup/index.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-
-
-
- 演示效果
-
-
- 唤起弹窗
-
-
-
- 关闭弹窗
-
-
-
- 关闭弹窗
-
-
-
-
-
-
- 参数配置
-
-
- 状态
-
-
-
- 弹出方向
-
-
-
- 关闭按钮
-
-
-
- 关闭按钮位置
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsC/progress/index.vue b/client_mp/pages/componentsC/progress/index.vue
deleted file mode 100644
index f50f901..0000000
--- a/client_mp/pages/componentsC/progress/index.vue
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
- 演示效果
-
-
-
-
-
- 查找中
-
-
-
-
-
-
- 参数配置
-
-
- 模式选择
-
-
-
- 增减
-
-
-
- 自定义样式(线型时有效)
-
-
-
- 动态条纹(线型时有效)
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsC/section/index.vue b/client_mp/pages/componentsC/section/index.vue
deleted file mode 100644
index 65902f5..0000000
--- a/client_mp/pages/componentsC/section/index.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
- 演示效果
-
-
-
-
-
-
- 参数配置
-
-
- 更换主标题
-
-
-
- 竖条状态
-
-
-
- 是否显示右边部分
-
-
-
- 主标题粗体
-
-
-
- 主标题颜色
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsC/subsection/index.vue b/client_mp/pages/componentsC/subsection/index.vue
deleted file mode 100644
index 87f9852..0000000
--- a/client_mp/pages/componentsC/subsection/index.vue
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-
- 演示效果
-
-
-
-
-
-
- 参数配置
-
-
- 模式选择(为满足演示需要,切换会有抖动,非性能问题)
-
-
-
- Current值
-
-
-
- 活动选项字颜色
-
-
-
- 字体加粗
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/componentsC/test/index.vue b/client_mp/pages/componentsC/test/index.vue
deleted file mode 100644
index 33247b0..0000000
--- a/client_mp/pages/componentsC/test/index.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/client_mp/pages/example/components.config.js b/client_mp/pages/example/components.config.js
deleted file mode 100644
index ebc6f09..0000000
--- a/client_mp/pages/example/components.config.js
+++ /dev/null
@@ -1,389 +0,0 @@
-
-export default [{
- groupName: '基础组件',
- groupName_en: 'Basic components',
- list: [{
- path: '/pages/componentsC/color/index',
- icon: 'color',
- title: 'Color 色彩',
- title_en: 'Color',
- }, {
- path: '/pages/componentsA/icon/index',
- icon: 'icon',
- title: 'Icon 图标',
- title_en: 'Icon',
- },{
- path: '/pages/componentsB/image/index',
- icon: 'image',
- title: 'Image 图片',
- title_en: 'Image',
- }, {
- path: '/pages/componentsC/button/index',
- icon: 'button',
- title: 'Button 按钮',
- title_en: 'Button',
- }, {
- path: '/pages/componentsC/layout/index',
- icon: 'layout',
- title: 'Layout 布局',
- title_en: 'Layout',
- }, {
- path: '/pages/componentsC/cell/index',
- icon: 'cell',
- title: 'Cell 单元格',
- title_en: 'Cell',
- }, {
- path: '/pages/componentsC/badge/index',
- icon: 'badge',
- title: 'Badge 徽标数',
- title_en: 'Badge',
- }, {
- path: '/pages/componentsA/tag/index',
- icon: 'tag',
- title: 'Tag 标签',
- title_en: 'Tag',
- }]
- },
- {
- groupName: '表单组件',
- groupName_en: 'Form components',
- list: [{
- path: '/pages/componentsA/form/index',
- icon: 'form',
- title: 'Form 表单',
- title_en: 'Form',
- }, {
- path: '/pages/componentsA/calendar/index',
- icon: 'calendar',
- title: 'Calendar 日历',
- title_en: 'Calendar',
- }, {
- path: '/pages/componentsA/select/index',
- icon: 'select',
- title: 'Select 列选择器',
- title_en: 'Select',
- }, {
- path: '/pages/componentsA/keyboard/index',
- icon: 'keyboard',
- title: 'Keyboard 键盘',
- title_en: 'Keyboard',
- }, {
- path: '/pages/componentsB/picker/index',
- icon: 'picker',
- title: 'Picker 选择器',
- title_en: 'Picker',
- }, {
- path: '/pages/componentsB/rate/index',
- icon: 'rate',
- title: 'Rate 评分',
- title_en: 'Rate',
- }, {
- path: '/pages/componentsB/search/index',
- icon: 'search',
- title: 'Search 搜索',
- title_en: 'Search',
- }, {
- path: '/pages/componentsC/numberBox/index',
- icon: 'numberBox',
- title: 'NumberBox 步进器',
- title_en: 'NumberBox',
- }, {
- path: '/pages/componentsB/upload/index',
- icon: 'upload',
- title: 'Upload 上传',
- title_en: 'Upload',
- }, {
- path: '/pages/componentsA/verificationCode/index',
- icon: 'verificationCode',
- title: 'VerificationCode 验证码倒计时',
- title_en: 'VerificationCode',
- }, {
- path: '/pages/componentsA/field/index',
- icon: 'field',
- title: 'Field 输入框',
- title_en: 'Field',
- }, {
- path: '/pages/componentsB/checkbox/index',
- icon: 'checkbox',
- title: 'Checkbox 复选框',
- title_en: 'Checkbox',
- }, {
- path: '/pages/componentsB/radio/index',
- icon: 'radio',
- title: 'Radio 单选框',
- title_en: 'Radio',
- }, {
- path: '/pages/componentsB/switch/index',
- icon: 'switch',
- title: 'Switch 开关选择器',
- title_en: 'Switch',
- }, {
- path: '/pages/componentsA/slider/index',
- icon: 'slider',
- title: 'Slider 滑动选择器',
- title_en: 'Slider',
- }]
- }, {
- groupName: '数据组件',
- groupName_en: 'Data components',
- list: [{
- path: '/pages/componentsC/progress/index',
- icon: 'progress',
- title: 'Progress 进度条',
- title_en: 'Progress',
- }, {
- path: '/pages/componentsB/table/index',
- icon: 'table',
- title: 'Table 表格',
- title_en: 'Table',
- }, {
- path: '/pages/componentsC/countDown/index',
- icon: 'countDown',
- title: 'CountDown 倒计时',
- title_en: 'CountDown',
- }, {
- path: '/pages/componentsC/countTo/index',
- icon: 'countTo',
- title: 'CountTo 数字滚动',
- title_en: 'CountTo',
- }]
- }, {
- groupName: '反馈组件',
- groupName_en: 'Feedback components',
- list: [{
- path: '/pages/componentsC/actionSheet/index',
- icon: 'actionSheet',
- title: 'ActionSheet 操作菜单',
- title_en: 'ActionSheet',
- }, {
- path: '/pages/componentsC/alertTips/index',
- icon: 'alertTips',
- title: 'AlertTips 警告提示',
- title_en: 'AlertTips',
- }, {
- path: '/pages/componentsA/toast/index',
- icon: 'toast',
- title: 'Toast 消息提示',
- title_en: 'Toast',
- }, {
- path: '/pages/componentsB/noticeBar/index',
- icon: 'noticeBar',
- title: 'NoticeBar 滚动通知',
- title_en: 'NoticeBar',
- }, {
- path: '/pages/componentsA/topTips/index',
- icon: 'topTips',
- title: 'TopTips 顶部提示',
- title_en: 'TopTips',
- }, {
- path: '/pages/componentsB/swipeAction/index',
- icon: 'swipeAction',
- title: 'SwipeAction 滑动单元格',
- title_en: 'SwipeAction',
- }, {
- path: '/pages/componentsC/collapse/index',
- icon: 'collapse',
- title: 'Collapse 折叠面板',
- title_en: 'Collapse',
- }, {
- path: '/pages/componentsC/popup/index',
- icon: 'popup',
- title: 'Popup 弹出层',
- title_en: 'Popup',
- }, {
- path: '/pages/componentsA/modal/index',
- icon: 'modal',
- title: 'Modal 模态框',
- title_en: 'Modal',
- }, {
- path: '/pages/componentsA/fullScreen/index',
- icon: 'pressingScreen',
- title: 'fullScreen 压窗屏',
- title_en: 'fullScreen',
- }]
- }, {
- groupName: '布局组件',
- groupName_en: 'Layout components',
- list: [{
- path: '/pages/componentsB/line/index',
- icon: 'line',
- title: 'Line 线条',
- title_en: 'Line',
- }, {
- path: '/pages/componentsB/card/index',
- icon: 'card',
- title: 'Card 卡片',
- title_en: 'Card',
- }, {
- path: '/pages/componentsC/mask/index',
- icon: 'mask',
- title: 'Mask 遮罩层',
- title_en: 'Mask',
- },
- // #ifndef MP-TOUTIAO
- {
- path: '/pages/componentsA/noNetwork/index',
- icon: 'noNetwork',
- title: 'NoNetwork 无网络提示',
- title_en: 'NoNetwork',
- },
- // #endif
- {
- path: '/pages/componentsC/grid/index',
- icon: 'grid',
- title: 'Grid 宫格布局',
- title_en: 'Grid',
- }, {
- path: '/pages/componentsB/swiper/index',
- icon: 'swiper',
- title: 'Swiper 轮播图',
- title_en: 'Swiper',
- }, {
- path: '/pages/componentsA/timeLine/index',
- icon: 'timeLine',
- title: 'TimeLine 时间轴',
- title_en: 'TimeLine',
- }, {
- path: '/pages/componentsB/skeleton/index',
- icon: 'skeleton',
- title: 'Skeleton 骨架屏',
- title_en: 'Skeleton',
- }, {
- path: '/pages/componentsB/sticky/index',
- icon: 'sticky',
- title: 'Sticky 吸顶',
- title_en: 'Sticky',
- },
- // #ifndef MP-TOUTIAO
- {
- path: '/pages/componentsB/waterfall/index',
- icon: 'waterfall',
- title: 'Waterfall 瀑布流',
- title_en: 'Waterfall',
- },
- // #endif
- {
- path: '/pages/componentsB/divider/index',
- icon: 'divider',
- title: 'Divider 分割线',
- title_en: 'Divider',
- }]
- }, {
- groupName: '导航组件',
- groupName_en: 'Navigation components',
- list: [{
- path: '/pages/componentsB/dropdown/index',
- icon: 'dropdown',
- title: 'Dropdown 下拉菜单',
- title_en: 'Dropdown',
- },{
- path: '/pages/componentsB/tabbar/index',
- icon: 'tabbar',
- title: 'Tabbar 底部导航栏',
- title_en: 'Tabbar',
- },{
- path: '/pages/componentsA/backTop/index',
- icon: 'backTop',
- title: 'BackTop 返回顶部',
- title_en: 'BackTop',
- },{
- path: '/pages/componentsA/navbar/index',
- icon: 'navbar',
- title: 'Navbar 导航栏',
- title_en: 'Navbar',
- }, {
- path: '/pages/componentsA/tabs/index',
- icon: 'tabs',
- title: 'Tabs 标签',
- title_en: 'Tabs',
- },
- // #ifndef MP-ALIPAY
- {
- path: '/pages/template/order/index',
- icon: 'tabsSwiper',
- title: 'TabsSwiper 全屏选项卡',
- title_en: 'TabsSwiper',
- },
- // #endif
- {
- path: '/pages/componentsC/subsection/index',
- icon: 'subsection',
- title: 'Subsection 分段器',
- title_en: 'Subsection',
- }, {
- path: '/pages/componentsA/indexList/index',
- icon: 'indexList',
- title: 'IndexList 索引列表',
- title_en: 'IndexList',
- }, {
- path: '/pages/componentsB/steps/index',
- icon: 'steps',
- title: 'Steps 步骤条',
- title_en: 'Steps',
- }, {
- path: '/pages/componentsA/empty/index',
- icon: 'empty',
- title: 'Empty 内容为空',
- title_en: 'Empty',
- }, {
- path: '/pages/componentsC/section/index',
- icon: 'section',
- title: 'Section 查看更多',
- title_en: 'Section',
- }]
- }, {
- groupName: '其他组件',
- groupName_en: 'Other components',
- list: [{
- path: '/pages/componentsA/parse/index',
- icon: 'parse',
- title: 'Parse 富文本解析器',
- title_en: 'Parse',
- },{
- path: '/pages/componentsC/messageInput/index',
- icon: 'messageInput',
- title: 'MessageInput 验证码输入',
- title_en: 'MessageInput',
- }, {
- path: '/pages/componentsA/avatarCropper/index',
- icon: 'avatarCropper',
- title: 'AvatarCropper 头像裁剪',
- title_en: 'AvatarCropper',
- }, {
- path: '/pages/componentsC/loadmore/index',
- icon: 'loadmore',
- title: 'Loadmore 加载更多',
- title_en: 'Loadmore',
- }, {
- path: '/pages/componentsB/readMore/index',
- icon: 'readMore',
- title: 'ReadMore 展开阅读更多',
- title_en: 'ReadMore',
- }, {
- path: '/pages/componentsA/lazyLoad/index',
- icon: 'lazyLoad',
- title: 'LazyLoad 懒加载',
- title_en: 'LazyLoad',
- }, {
- path: '/pages/componentsC/gap/index',
- icon: 'gap',
- title: 'Gap 间隔槽',
- title_en: 'Gap',
- }, {
- path: '/pages/componentsA/avatar/index',
- icon: 'avatar',
- title: 'Avatar 头像',
- title_en: 'Avatar',
- }, {
- path: '/pages/componentsC/link/index',
- icon: 'link',
- title: 'Link 超链接',
- title_en: 'Link',
- }, {
- path: '/pages/componentsB/loading/index',
- icon: 'loading',
- title: 'Loading 加载动画',
- title_en: 'Loading',
- }]
- },
-]
diff --git a/client_mp/pages/example/components.vue b/client_mp/pages/example/components.vue
deleted file mode 100644
index c763ee6..0000000
--- a/client_mp/pages/example/components.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/example/js.config.js b/client_mp/pages/example/js.config.js
deleted file mode 100644
index 7365cab..0000000
--- a/client_mp/pages/example/js.config.js
+++ /dev/null
@@ -1,120 +0,0 @@
-export default [
- {
- groupName: '网络',
- groupName_en: 'Network',
- list: [
- {
- path: 'http',
- icon: 'http',
- title: 'Http 请求',
- title_en: 'Http',
- }
- ]
- },
- {
- groupName: '全局变量',
- groupName_en: 'Global variable',
- list: [
- {
- path: 'globalVariable',
- icon: 'globalVariable',
- title: 'GlobalVariable 全局变量',
- title_en: 'GlobalVariable',
- }
- ]
- },
- {
- groupName: '工具库',
- groupName_en: 'Tool library',
- list: [
- {
- path: 'debounce',
- icon: 'debounce',
- title: 'Throttle | Debounce 节流防抖',
- title_en: 'Throttle | Debounce',
- },
- {
- path: 'deepMerge',
- icon: 'deepMerge',
- title: 'DeepMerge 对象深度合并',
- title_en: 'DeepMerge',
- },{
- path: 'deepClone',
- icon: 'deepClone',
- title: 'DeepClone 对象深度克隆',
- title_en: 'DeepClone',
- },
- {
- path: 'timeFormat',
- icon: 'timeFormat',
- title: 'TimeFormat 时间格式化',
- title_en: 'TimeFormat',
- },{
- path: 'timeFrom',
- icon: 'timeFrom',
- title: 'TimeFrom 多久之前',
- title_en: 'TimeFrom',
- },{
- path: 'guid',
- icon: 'guid',
- title: 'Guid 全局唯一id',
- title_en: 'Guid',
- },{
- path: 'route',
- icon: 'route',
- title: 'Route 路由跳转',
- title_en: 'Route',
- },{
- path: 'randomArray',
- icon: 'randomArray',
- title: 'RandomArray 数组乱序',
- title_en: 'RandomArray',
- },{
- path: 'colorSwitch',
- icon: 'colorSwitch',
- title: 'ColorSwitch 颜色转换',
- title_en: 'ColorSwitch',
- },{
- path: 'color',
- icon: 'color',
- title: 'Color 颜色值',
- title_en: 'Color',
- },{
- path: 'queryParams',
- icon: 'queryParams',
- title: 'QueryParams 对象转URL参数',
- title_en: 'QueryParams',
- },{
- path: 'test',
- icon: 'test',
- title: 'Test 规则校验',
- title_en: 'Test',
- },{
- path: 'md5',
- icon: 'md5',
- title: 'Md5 md5加密',
- title_en: 'Md5',
- },{
- path: 'random',
- icon: 'random',
- title: 'Random 随机数值',
- title_en: 'Random',
- },{
- path: 'trim',
- icon: 'trim',
- title: 'Trim 去除空格',
- title_en: 'Trim',
- },{
- path: 'getRect',
- icon: 'getRect',
- title: 'GetRect 节点信息',
- title_en: 'GetRect',
- },{
- path: 'mpShare',
- icon: 'mpShare',
- title: 'MpShare 小程序分享',
- title_en: 'MpShare',
- }
- ]
- }
-]
\ No newline at end of file
diff --git a/client_mp/pages/example/js.vue b/client_mp/pages/example/js.vue
deleted file mode 100644
index e9848b8..0000000
--- a/client_mp/pages/example/js.vue
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/example/template.config.js b/client_mp/pages/example/template.config.js
deleted file mode 100644
index 9a4bdc1..0000000
--- a/client_mp/pages/example/template.config.js
+++ /dev/null
@@ -1,78 +0,0 @@
-export default [
- {
- groupName: '部件',
- groupName_en: 'Parts',
- list: [
- {
- path: 'coupon',
- icon: 'coupon',
- title: 'Coupon 优惠券',
- title_en: 'Coupon',
- }
- ]
- },
- {
- groupName: '页面',
- groupName_en: 'Page',
- list: [
- {
- path: '/pages/template/wxCenter/index',
- icon: 'wxCenter',
- title: 'WxCenter 仿微信个人中心',
- title_en: 'WxCenter',
- },
- // {
- // path: '/pages/template/douyin/index',
- // icon: 'douyin',
- // title: 'Douyin 仿抖音',
- // },
- {
- path: '/pages/template/keyboardPay/index',
- icon: 'keyboardPay',
- title: 'KeyboardPay 自定义键盘支付模板',
- title_en: 'KeyboardPay',
- },
- {
- path: '/pages/template/mallMenu/index1',
- icon: 'mall_menu_1',
- title: 'MallMenu 垂直分类(左右独立)',
- title_en: 'MallMenu 1',
- },{
- path: '/pages/template/mallMenu/index2',
- icon: 'mall_menu_2',
- title: 'MallMenu 垂直分类(左右联动)',
- title_en: 'MallMenu 2',
- },{
- path: 'submitBar',
- icon: 'submitBar',
- title: 'SubmitBar 提交订单栏',
- title_en: 'SubmitBar',
- },{
- path: 'comment',
- icon: 'comment',
- title: 'Comment 评论列表',
- title_en: 'Comment',
- },{
- path: 'order',
- icon: 'order',
- title: 'Order 订单列表',
- title_en: 'Order',
- },{
- path: 'login',
- icon: 'login',
- title: 'Login 登录界面',
- title_en: 'Login',
- },{
- path: 'address',
- icon: 'address',
- title: 'Address 收货地址',
- title_en: 'Address',
- },{
- path: 'citySelect',
- icon: 'citySelect',
- title: 'CitySelect 城市选择',
- title_en: 'CitySelect',
- }
- ]
- }
-]
\ No newline at end of file
diff --git a/client_mp/pages/example/template.vue b/client_mp/pages/example/template.vue
deleted file mode 100644
index 8fb9ef9..0000000
--- a/client_mp/pages/example/template.vue
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/home/home.vue b/client_mp/pages/home/home.vue
index 5072e60..50397f0 100644
--- a/client_mp/pages/home/home.vue
+++ b/client_mp/pages/home/home.vue
@@ -1,5 +1,5 @@
-
+
@@ -15,7 +15,7 @@
+ @body-click="taskClick" :index="item.id" padding="10">
{{item.state}}
@@ -67,17 +67,17 @@
grids: [{
name: '巡查任务',
icon: 'calendar',
- path: '/pages/subtask/my'
+ path: '/pages/subtask/my',
},
{
name: '能力共享',
icon: 'share',
- path: ''
+ path: '',
},
{
name: '手册/资料',
icon: 'file-text',
- path: ''
+ path: '',
}
],
headstyle: {
@@ -97,16 +97,11 @@
},
onShow() {
- this.getMyInspectTask();
+ this.getMyInspectTaskList();
},
methods: {
- getUserInfo() {
- this.$u.api.getUserInfo().then(res => {
-
- }).catch(e => {})
- },
- getMyInspectTask() {
- this.$u.api.getMyInspectTask({
+ getMyInspectTaskList() {
+ this.$u.api.getMyInspectTaskList({
state: '执行中'
}).then(res => {
this.myinspecttaskList = res.data
@@ -129,15 +124,27 @@
})
},
clickGrid(val){
- uni.navigateTo({
- url:val.path
- })
+ if(val.path){
+ uni.navigateTo({
+ url:val.path
+ })
+ }else{
+ uni.showToast({
+ title:"暂未开放",
+ icon:"none"
+ })
+ }
+
}
}
}
-
+
diff --git a/client_mp/pages/inspectrecord/index.vue b/client_mp/pages/inspectrecord/index.vue
new file mode 100644
index 0000000..d48e041
--- /dev/null
+++ b/client_mp/pages/inspectrecord/index.vue
@@ -0,0 +1,250 @@
+
+
+
+
+
+ {{initData.state}}
+
+
+
+
+ 只看我的
+ 提交结果
+ 查看报告
+
+
+
+
+
+
+
+
+
+
+
+ {{item.item_.sortnum}}.{{item.item_.name}}
+
+ {{item.checker_.name}}--
+ {{item.result}}
+ {{item.result}}
+ {{item.result}}
+
+
+ 检查
+ 详情
+
+
+
+
+
+
+
+
+ 没有更多了
+
+
+
+
+
+
+
+
diff --git a/client_mp/pages/inspectrecord/recorddetail.vue b/client_mp/pages/inspectrecord/recorddetail.vue
new file mode 100644
index 0000000..6375fd4
--- /dev/null
+++ b/client_mp/pages/inspectrecord/recorddetail.vue
@@ -0,0 +1,89 @@
+
+
+
+
+ 类别:{{form.item_.type}}
+ {{form.item_.sortnum}}.{{form.item_.name}}
+
+
+ {{form.item_.require}}
+
+
+ {{form.result}}
+
+
+ {{form.note}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/client_mp/pages/inspectrecord/recorddo.vue b/client_mp/pages/inspectrecord/recorddo.vue
new file mode 100644
index 0000000..47c8905
--- /dev/null
+++ b/client_mp/pages/inspectrecord/recorddo.vue
@@ -0,0 +1,126 @@
+
+
+
+
+ 类别:{{form.item_.type}}
+ {{form.item_.sortnum}}.{{form.item_.name}}
+
+
+ {{form.item_.require}}
+
+
+
+
+ {{ item }}
+
+
+
+
+
+
+
+
+
+ 提交
+
+
+
+
+
+
+
diff --git a/client_mp/pages/library/color/index.vue b/client_mp/pages/library/color/index.vue
deleted file mode 100644
index 7a9f308..0000000
--- a/client_mp/pages/library/color/index.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
- 演示效果
-
-
- 此处演示为通过JS调用框架内置颜色值,此外还可以通过scss变量调用。
-
-
- 晓镜但愁云鬓改,夜吟应觉月光寒
-
-
-
-
-
- 参数配置
-
-
- 主题
-
-
-
- 常用颜色
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/library/colorSwitch/index.vue b/client_mp/pages/library/colorSwitch/index.vue
deleted file mode 100644
index f9af787..0000000
--- a/client_mp/pages/library/colorSwitch/index.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
- 演示效果
-
-
- {{result}}
-
-
-
-
-
- 参数配置
-
-
- GRB转HEX
-
-
-
- HEX转GRB
-
-
-
- 颜色渐变(rgb(21,21,21)-rgb(56,56,56),分10份)
- 执行
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/library/debounce/index.vue b/client_mp/pages/library/debounce/index.vue
deleted file mode 100644
index 3f93fa0..0000000
--- a/client_mp/pages/library/debounce/index.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-
-
-
- 演示效果
-
-
- 选择节流或者防抖模式,点击按钮,将会执行回调并显示在下方:
-
-
- {{(index >= 1) ? '-' : ''}}回调
-
-
-
-
-
- 点击触发
-
-
- 参数配置
-
-
- 模式
-
-
-
- 时间间隔
-
-
-
- 执行时机
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/library/deepClone/index.vue b/client_mp/pages/library/deepClone/index.vue
deleted file mode 100644
index 1d639d2..0000000
--- a/client_mp/pages/library/deepClone/index.vue
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
- 演示效果
-
-
- 源对象为:"{info: {name: 'mary'}}"
-
-
- {{result}}
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/library/deepMerge/index.vue b/client_mp/pages/library/deepMerge/index.vue
deleted file mode 100644
index 662fc56..0000000
--- a/client_mp/pages/library/deepMerge/index.vue
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
- 演示效果
-
-
- 源对象1为:"{info: {name: 'mary'}}"
-
-
-
- 源对象2为:"{info: {age: '22'}}"
-
-
- {{result}}
-
-
-
-
-
- 参数配置
-
-
- 模式
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/library/getRect/index.vue b/client_mp/pages/library/getRect/index.vue
deleted file mode 100644
index 50be09a..0000000
--- a/client_mp/pages/library/getRect/index.vue
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
- 演示效果
-
-
- 第一个节点
- 第2个节点
- 节点信息为
- {{ JSON.stringify(result) }}
-
-
-
- 点我自动滚动到顶部
-
-
-
-
-
- 参数配置
-
- 元素
-
-
-
- 指定元素置顶
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/library/globalVariable/globalData.vue b/client_mp/pages/library/globalVariable/globalData.vue
deleted file mode 100644
index 9983586..0000000
--- a/client_mp/pages/library/globalVariable/globalData.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
- 演示效果
-
-
- 此处为演示globalData全局变量的使用,需手动更新
-
-
- {{result}}
-
-
-
-
-
- 参数配置
-
-
- 修改globalData为如下值
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/library/globalVariable/index.vue b/client_mp/pages/library/globalVariable/index.vue
deleted file mode 100644
index f9ab949..0000000
--- a/client_mp/pages/library/globalVariable/index.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
- 演示效果
-
-
- globalData方案的值为(曲折实现,全局动态响应)
-
-
- {{globalData}}
-
-
-
-
- Vue.prototype方案的值为(非动态响应,微信小程序无效)
-
-
- {{vuePrototype}}
-
-
-
-
- vuex方案的值为(全局动态响应,推荐)
-
-
- {{vuex_demo}}
-
-
-
-
-
- 参数配置
-
-
- 实现方式
-
- globalData
-
-
- Vue.prototype
-
-
- vuex
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/library/globalVariable/prototype.vue b/client_mp/pages/library/globalVariable/prototype.vue
deleted file mode 100644
index 820cd08..0000000
--- a/client_mp/pages/library/globalVariable/prototype.vue
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
- 演示效果
-
-
- 此处为演示定义在main.js中的"Vue.prototype"全局变量的使用,它不是动态响应的,修改后本页面和上一个页面的值,都不会自动刷新
-
-
- {{vuePrototype}}
-
-
-
-
-
- 参数配置
-
-
- 修改vuePrototype为如下值
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/library/globalVariable/vuex.vue b/client_mp/pages/library/globalVariable/vuex.vue
deleted file mode 100644
index 0104862..0000000
--- a/client_mp/pages/library/globalVariable/vuex.vue
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
- 演示效果
-
-
- 此处为演示vuex全局变量的使用
-
-
- {{vuex_demo}}
-
-
-
-
-
- 参数配置
-
-
- 修改vuex变量为如下值
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/client_mp/pages/library/guid/index.vue b/client_mp/pages/library/guid/index.vue
deleted file mode 100644
index 8d99a05..0000000
--- a/client_mp/pages/library/guid/index.vue
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
- 演示效果
-
-
- {{result}}
-
-
-
-
-
- 参数配置
-
-
- 长度
-
-
-
- 首字符为"u"
-
-
-
- 取值基数(进制)
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/library/http/index.vue b/client_mp/pages/library/http/index.vue
deleted file mode 100644
index 67ee3ab..0000000
--- a/client_mp/pages/library/http/index.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
- 演示效果
-
-
- 请求结果为:
-
-
- {{JSON.stringify(result)}}
-
-
-
-
-
- 参数配置
-
-
- 请求方式
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/library/md5/index.vue b/client_mp/pages/library/md5/index.vue
deleted file mode 100644
index e9b786a..0000000
--- a/client_mp/pages/library/md5/index.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
- 演示效果
-
-
- {{result}}
-
-
-
-
-
- 参数配置
-
-
- 源字符串
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/library/mpShare/index.vue b/client_mp/pages/library/mpShare/index.vue
deleted file mode 100644
index 9ad826d..0000000
--- a/client_mp/pages/library/mpShare/index.vue
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
- 演示效果
-
-
- 只对各家小程序有效,点击右上角的"胶囊",即可弹出分享菜单
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/library/queryParams/index.vue b/client_mp/pages/library/queryParams/index.vue
deleted file mode 100644
index 806d2a2..0000000
--- a/client_mp/pages/library/queryParams/index.vue
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
- 演示效果
-
- 源对象:{{JSON.stringify(params)}}
-
- {{result}}
-
-
-
-
-
- 参数配置
-
-
- 是否带问号
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/library/random/index.vue b/client_mp/pages/library/random/index.vue
deleted file mode 100644
index a3fe3d1..0000000
--- a/client_mp/pages/library/random/index.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
- 演示效果
-
-
- {{result}}
-
-
-
-
-
- 参数配置
-
-
- 操作
-
-
- 执行
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/library/randomArray/index.vue b/client_mp/pages/library/randomArray/index.vue
deleted file mode 100644
index f1c953d..0000000
--- a/client_mp/pages/library/randomArray/index.vue
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
- 演示效果
-
-
- 源数组为:[1, 2, 3, 4, 5]
-
-
- {{`[${result.join(', ')}]`}}
-
-
-
-
-
- 参数配置
-
-
- 操作
- 执行
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/library/route/index.vue b/client_mp/pages/library/route/index.vue
deleted file mode 100644
index 85bdf43..0000000
--- a/client_mp/pages/library/route/index.vue
+++ /dev/null
@@ -1,86 +0,0 @@
-
-
-
- 演示效果
-
- 点击跳转
-
-
-
-
- 参数配置
-
-
- 类型
-
-
-
- 携带参数(针对type=navigateTo)
-
-
-
- 窗口动画(App且type=navigateTo||navigateBack时有效)
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/library/route/routeTo.vue b/client_mp/pages/library/route/routeTo.vue
deleted file mode 100644
index acccaf3..0000000
--- a/client_mp/pages/library/route/routeTo.vue
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
- 演示效果
-
-
- 收到的参数为:{{paramsStr}}
-
-
- 返回
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/library/test/index.vue b/client_mp/pages/library/test/index.vue
deleted file mode 100644
index e9a13cd..0000000
--- a/client_mp/pages/library/test/index.vue
+++ /dev/null
@@ -1,96 +0,0 @@
-
-
-
- 演示效果
-
-
-
- 这里仅对部分验证规则进行演示,目前总的验证规则有如下:
-
-
-
- 邮箱号
- 手机号
- URL
- 普通日期
-
-
- 十进制数
- 身份证号
- 车牌号
- 金额
-
-
- 汉字
- 字母
- 字母|数字
- 包含值
-
-
- 数值范围
- 长度范围
-
-
-
-
-
-
-
- 参数配置
-
-
- 邮箱
-
-
-
- 手机号
-
-
-
- 中文
-
-
-
- 整数
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/library/timeFormat/index.vue b/client_mp/pages/library/timeFormat/index.vue
deleted file mode 100644
index 78fdc0d..0000000
--- a/client_mp/pages/library/timeFormat/index.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
- 演示效果
-
- 输入时间:{{timestamp}}
-
- {{result}}
-
-
-
-
-
- 参数配置
-
-
- 格式
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/library/timeFrom/index.vue b/client_mp/pages/library/timeFrom/index.vue
deleted file mode 100644
index 9453999..0000000
--- a/client_mp/pages/library/timeFrom/index.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
- 演示效果
-
-
-
- 根据当前时间,返回类似"刚刚,5分钟前,8小时前,3天前"等字样
-
-
- {{result}}
-
-
-
-
-
- 参数配置
-
-
- 时间
-
-
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/library/trim/index.vue b/client_mp/pages/library/trim/index.vue
deleted file mode 100644
index cbd4e05..0000000
--- a/client_mp/pages/library/trim/index.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
- 演示效果
-
-
- 源字符串:{{`"${string}"`}}
-
-
- {{`"${result}"`}}
-
-
-
-
-
- 参数配置
-
-
- 模式选择
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/login/login_password.vue b/client_mp/pages/login/login_password.vue
index 9952015..4710526 100644
--- a/client_mp/pages/login/login_password.vue
+++ b/client_mp/pages/login/login_password.vue
@@ -72,7 +72,6 @@ export default {
if (valid) {
this.$u.api.login(this.loginForm).then(
res=>{
- console.log(res.data)
this.$u.vuex('vuex_token', res.data.access)
this.$u.api.getUserInfo().then(res=>{
this.$u.vuex('vuex_user', res.data)
diff --git a/client_mp/pages/subtask/my.vue b/client_mp/pages/subtask/my.vue
index 9f5b6fd..1369c68 100644
--- a/client_mp/pages/subtask/my.vue
+++ b/client_mp/pages/subtask/my.vue
@@ -40,18 +40,27 @@
}
},
onShow() {
- this.getMyInspectTask();
+ this.getMyInspectTaskList();
},
methods: {
- getMyInspectTask() {
- this.$u.api.getMyInspectTask({}).then(res => {
+ getMyInspectTaskList() {
+ this.$u.api.getMyInspectTaskList({}).then(res => {
this.myinspecttaskList = res.data
}).catch(e => {})
},
+ taskClick(index) {
+ uni.navigateTo({
+ url:"/pages/subtask/subtaskdetail?id="+index
+ })
+ },
}
}
-
+
+
diff --git a/client_mp/pages/template/address/addSite.vue b/client_mp/pages/template/address/addSite.vue
deleted file mode 100644
index c31340e..0000000
--- a/client_mp/pages/template/address/addSite.vue
+++ /dev/null
@@ -1,173 +0,0 @@
-
-
-
-
- 收货人
-
-
-
- 手机号码
-
-
-
- 所在地区
-
-
-
- 详细地址
-
-
-
-
-
-
- 标签
-
- 家
- 公司
- 学校
-
-
-
-
-
- 设置默认地址
- 提醒:每次下单会默认推荐该地址
-
-
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/template/address/index.vue b/client_mp/pages/template/address/index.vue
deleted file mode 100644
index bbfe196..0000000
--- a/client_mp/pages/template/address/index.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-
-
-
-
- {{ res.name }}
- {{ res.phone }}
-
- {{ item.tagText }}
-
-
-
- 广东省深圳市宝安区 自由路66号
-
-
-
-
-
- 新建收货地址
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/template/citySelect/index.vue b/client_mp/pages/template/citySelect/index.vue
deleted file mode 100644
index 9577dd2..0000000
--- a/client_mp/pages/template/citySelect/index.vue
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
- 演示效果
-
-
- {{ input ? input : 'Picker值' }}
-
-
-
- 参数配置
-
- 状态
- 打开Picker
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/template/citySelect/u-city-select.vue b/client_mp/pages/template/citySelect/u-city-select.vue
deleted file mode 100644
index bc3fdc6..0000000
--- a/client_mp/pages/template/citySelect/u-city-select.vue
+++ /dev/null
@@ -1,231 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/template/comment/index.vue b/client_mp/pages/template/comment/index.vue
deleted file mode 100644
index 34b856f..0000000
--- a/client_mp/pages/template/comment/index.vue
+++ /dev/null
@@ -1,207 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/template/comment/reply.vue b/client_mp/pages/template/comment/reply.vue
deleted file mode 100644
index cb8fd6a..0000000
--- a/client_mp/pages/template/comment/reply.vue
+++ /dev/null
@@ -1,228 +0,0 @@
-
-
-
-
- 全部回复({{ comment.allReply }})
-
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/template/coupon/index.vue b/client_mp/pages/template/coupon/index.vue
deleted file mode 100644
index debc82c..0000000
--- a/client_mp/pages/template/coupon/index.vue
+++ /dev/null
@@ -1,374 +0,0 @@
-
-
-
-
-
-
- ¥
- 8
-
- 抵用券
-
-
- 【洗牙】8元无门槛红包
- 今日到期
-
-
- 立即使用
-
-
-
-
-
- 满8.1元可用、限最新版本客户端使用
-
- 使用规则
-
-
-
-
-
-
-
- ¥
- 100
-
- 满149元可用
-
-
-
-
- 限品类东券
- 仅可购买个人护理部分商品
-
-
- 2020.01.01-2020.01.31
- 立即使用
-
-
-
-
-
- 可赠送
-
-
-
-
-
-
-
-
- 袜子精保护协会
-
- 进店
-
-
-
-
-
-
- ¥
- 3
- 满88减3
-
- 店铺优惠券
- 2019.11.28-2020.1.24
-
-
-
- 去使用
-
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/template/douyin/index.nvue b/client_mp/pages/template/douyin/index.nvue
deleted file mode 100644
index ba2d2fe..0000000
--- a/client_mp/pages/template/douyin/index.nvue
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
diff --git a/client_mp/pages/template/keyboardPay/index.vue b/client_mp/pages/template/keyboardPay/index.vue
deleted file mode 100644
index 568bedf..0000000
--- a/client_mp/pages/template/keyboardPay/index.vue
+++ /dev/null
@@ -1,113 +0,0 @@
-
-
-
-
-
- 发送1.00元红包
-
-
-
-
-
- 1.00
- 元
-
-
-
-
-
-
-
- 支付键盘
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/client_mp/pages/template/login/code.vue b/client_mp/pages/template/login/code.vue
deleted file mode 100644
index d8a81f4..0000000
--- a/client_mp/pages/template/login/code.vue
+++ /dev/null
@@ -1,112 +0,0 @@
-
-
-
- 输入验证码
- 验证码已发送至 +150****9320
-
- 验证码错误,请重新输入
-
- 收不到验证码点这里
- {{ second }}秒后重新获取验证码
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/template/login/index.vue b/client_mp/pages/template/login/index.vue
deleted file mode 100644
index d73cfea..0000000
--- a/client_mp/pages/template/login/index.vue
+++ /dev/null
@@ -1,130 +0,0 @@
-
-
-
-
- 欢迎登录美团
-
- 未注册的手机号验证后自动创建美团账号
-
-
- 密码登录
- 遇到问题
-
-
-
-
-
-
- 微信
-
-
-
- QQ
-
-
-
- 登录代表同意
- 美团点评用户协议、隐私政策,
- 并授权使用您的美团点评账号信息(如昵称、头像、收获地址)以便您统一管理
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/template/mallMenu/index1.vue b/client_mp/pages/template/mallMenu/index1.vue
deleted file mode 100644
index a42dc20..0000000
--- a/client_mp/pages/template/mallMenu/index1.vue
+++ /dev/null
@@ -1,206 +0,0 @@
-
-
-
-
-
- 搜索uView
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/template/mallMenu/index2.vue b/client_mp/pages/template/mallMenu/index2.vue
deleted file mode 100644
index b8d0bf4..0000000
--- a/client_mp/pages/template/mallMenu/index2.vue
+++ /dev/null
@@ -1,291 +0,0 @@
-
-
-
-
-
- 搜索
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/template/order/index.vue b/client_mp/pages/template/order/index.vue
deleted file mode 100644
index dffd2c7..0000000
--- a/client_mp/pages/template/order/index.vue
+++ /dev/null
@@ -1,506 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ res.store }}
-
-
- {{ res.deal }}
-
-
-
-
- {{ item.title }}
- {{ item.type }}
- 发货时间 {{ item.deliveryTime }}
-
-
-
- ¥{{ priceInt(item.price) }}
- .{{ priceDecimal(item.price) }}
-
- x{{ item.number }}
-
-
-
- 共{{ totalNum(res.goodsList) }}件商品 合计:
-
- ¥{{ priceInt(totalPrice(res.goodsList)) }}.
- {{ priceDecimal(totalPrice(res.goodsList)) }}
-
-
-
-
- 查看物流
- 卖了换钱
- 评价
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ res.store }}
-
-
- {{ res.deal }}
-
-
-
-
- {{ item.title }}
- {{ item.type }}
- 发货时间 {{ item.deliveryTime }}
-
-
-
- ¥{{ priceInt(item.price) }}
- .{{ priceDecimal(item.price) }}
-
- x{{ item.number }}
-
-
-
- 共{{ totalNum(res.goodsList) }}件商品 合计:
-
- ¥{{ priceInt(totalPrice(res.goodsList)) }}.
- {{ priceDecimal(totalPrice(res.goodsList)) }}
-
-
-
-
- 查看物流
- 卖了换钱
- 评价
-
-
-
-
-
-
-
-
-
-
-
-
-
- 您还没有相关的订单
- 可以去看看有那些想买的
-
- 随便逛逛
-
-
-
-
-
-
-
-
-
-
-
-
- {{ res.store }}
-
-
- {{ res.deal }}
-
-
-
-
- {{ item.title }}
- {{ item.type }}
- 发货时间 {{ item.deliveryTime }}
-
-
-
- ¥{{ priceInt(item.price) }}
- .{{ priceDecimal(item.price) }}
-
- x{{ item.number }}
-
-
-
- 共{{ totalNum(res.goodsList) }}件商品 合计:
-
- ¥{{ priceInt(totalPrice(res.goodsList)) }}.
- {{ priceDecimal(totalPrice(res.goodsList)) }}
-
-
-
-
- 查看物流
- 卖了换钱
- 评价
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/pages/template/submitBar/index.vue b/client_mp/pages/template/submitBar/index.vue
deleted file mode 100644
index 000542f..0000000
--- a/client_mp/pages/template/submitBar/index.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
-
- 客服
-
-
-
- 店铺
-
-
-
-
- 购物车
-
-
-
- 加入购物车
- 立即购买
-
-
-
-
-
-
-
diff --git a/client_mp/pages/template/wxCenter/index.vue b/client_mp/pages/template/wxCenter/index.vue
deleted file mode 100644
index deeca72..0000000
--- a/client_mp/pages/template/wxCenter/index.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- uView ui
- 微信号:helang_uView
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/client_mp/store/index.js b/client_mp/store/index.js
index 1a0ca68..3c7cada 100644
--- a/client_mp/store/index.js
+++ b/client_mp/store/index.js
@@ -31,8 +31,11 @@ const store = new Vuex.Store({
state: {
// 如果上面从本地获取的lifeData对象下有对应的属性,就赋值给state中对应的变量
// 加上vuex_前缀,是防止变量名冲突,也让人一目了然
- vuex_user: lifeData.vuex_user ? lifeData.vuex_user : {name: '明月'},
+ vuex_user: lifeData.vuex_user ? lifeData.vuex_user : {},
vuex_token: lifeData.vuex_token ? lifeData.vuex_token : '',
+ vuex_host: 'http://127.0.0.1:8000',
+ vuex_api: 'http://127.0.0.1:8000/api',
+ vuex_apifile: 'http://127.0.0.1:8000/api/file/'
// 如果vuex_version无需保存到本地永久存储,无需lifeData.vuex_version方式
// vuex_version: '1.0.1',
// vuex_demo: '绛紫',
diff --git a/client_mp/uview-ui/libs/css/style.vue.scss b/client_mp/uview-ui/libs/css/style.vue.scss
index 0821c94..1ab3707 100644
--- a/client_mp/uview-ui/libs/css/style.vue.scss
+++ b/client_mp/uview-ui/libs/css/style.vue.scss
@@ -1,6 +1,5 @@
page {
color: $u-main-color;
- background-color: #ededed;
font-size: 28rpx;
}
diff --git a/server/apps/quality/migrations/0010_inspectrecord_check_time.py b/server/apps/quality/migrations/0010_inspectrecord_check_time.py
new file mode 100644
index 0000000..0d12890
--- /dev/null
+++ b/server/apps/quality/migrations/0010_inspectrecord_check_time.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.5 on 2021-04-21 01:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('quality', '0009_auto_20210414_1606'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='inspectrecord',
+ name='check_time',
+ field=models.DateTimeField(blank=True, null=True, verbose_name='检查时间'),
+ ),
+ ]
diff --git a/server/apps/quality/migrations/0011_auto_20210422_1328.py b/server/apps/quality/migrations/0011_auto_20210422_1328.py
new file mode 100644
index 0000000..2a159ce
--- /dev/null
+++ b/server/apps/quality/migrations/0011_auto_20210422_1328.py
@@ -0,0 +1,19 @@
+# Generated by Django 3.0.5 on 2021-04-22 05:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('system', '0016_auto_20210331_1040'),
+ ('quality', '0010_inspectrecord_check_time'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='inspectrecord',
+ name='imgs',
+ field=models.ManyToManyField(blank=True, to='system.File', verbose_name='检查图片'),
+ ),
+ ]
diff --git a/server/apps/quality/models.py b/server/apps/quality/models.py
index 7ebc512..4cc2c9b 100644
--- a/server/apps/quality/models.py
+++ b/server/apps/quality/models.py
@@ -2,6 +2,11 @@ from django.db import models
from utils.model import BaseModel
from apps.system.models import CommonAModel, CommonBModel, Organization, User, Dict, File
# Create your models here.
+# class InspectTemplate(CommonAModel):
+# """
+# 检查模板
+# """
+# name = models.CharField('模板名称', max_length=200)
class InspectItem(CommonAModel):
"""
@@ -16,7 +21,7 @@ class InspectItem(CommonAModel):
type = models.CharField('类型', max_length=50, choices=type_choices, default='合规')
require = models.TextField('取证要求', null=True, blank=True)
sortnum = models.IntegerField('序号', default=1)
-
+ # template =
class Meta:
verbose_name = '检查清单'
verbose_name_plural = verbose_name
@@ -105,10 +110,11 @@ class InspectRecord(CommonAModel):
dept = models.ForeignKey(Organization, on_delete=models.CASCADE, verbose_name='受检查单位')
result = models.CharField('检查结果', max_length=50, choices=result_choices, null=True, blank=True)
note = models.TextField('检查说明', null=True, blank=True)
- imgs = models.ManyToManyField(File, verbose_name="检查图片")
+ imgs = models.ManyToManyField(File, verbose_name="检查图片", blank=True)
subtask = models.ForeignKey(SubInspectTask, on_delete=models.CASCADE, verbose_name='关联子任务')
checker = models.ForeignKey(User, on_delete=models.CASCADE, verbose_name='检查人', null=True, blank=True)
checked = models.BooleanField('是否检查', default=False)
+ check_time = models.DateTimeField('检查时间', null=True, blank=True)
class Meta:
verbose_name = '巡查记录'
diff --git a/server/apps/quality/serializers.py b/server/apps/quality/serializers.py
index d032421..cec91f5 100644
--- a/server/apps/quality/serializers.py
+++ b/server/apps/quality/serializers.py
@@ -2,8 +2,7 @@ from django.db.models.base import Model
from rest_framework import serializers
from .models import *
from apps.system.serializers import OrganizationSerializer,FileListSerializer,UserSimpleSerializer,OrganizationSimpleSerializer, FileSimpleSerializer
-
-
+from rest_framework.exceptions import ParseError
class InspectItemSerializer(serializers.ModelSerializer):
cate_name = serializers.StringRelatedField(source='cate', read_only=True)
class Meta:
@@ -15,6 +14,18 @@ class InspectItemSerializer(serializers.ModelSerializer):
queryset = queryset.select_related('cate')
return queryset
+class InspectItemSimpleSerializer(serializers.ModelSerializer):
+ # cate_name = serializers.StringRelatedField(source='cate', read_only=True)
+ class Meta:
+ model = InspectItem
+ fields = ['id', 'name', 'type', 'sortnum']
+
+ # @staticmethod
+ # def setup_eager_loading(queryset):
+ # queryset = queryset.select_related('cate')
+ # return queryset
+
+
class InspectTaskSerializer(serializers.ModelSerializer):
create_by_ = UserSimpleSerializer(source='create_by', read_only=True)
dept_count = serializers.SerializerMethodField()
@@ -58,7 +69,7 @@ class SubtaskListSerializer(serializers.ModelSerializer):
class InspectRecordListSerializer(serializers.ModelSerializer):
- item_ = InspectItemSerializer(source='item', read_only=True)
+ item_ = InspectItemSimpleSerializer(source='item', read_only=True)
checker_ = UserSimpleSerializer(source='checker', read_only=True)
class Meta:
model = InspectRecord
@@ -84,9 +95,20 @@ class InspectRecordDetailSerializer(serializers.ModelSerializer):
return queryset
class InspectDeptSerializer(serializers.ModelSerializer):
+ dept__name = serializers.CharField(source='dept.name', read_only=True)
+ leader = serializers.SerializerMethodField()
class Meta:
model = InspectDept
- fields = '__all__'
+ fields = ('dept', 'dept__name', 'state', 'subtask', 'id', 'note', 'leader')
+
+ @staticmethod
+ def setup_eager_loading(queryset):
+ queryset = queryset.select_related('dept', 'subtask')
+ return queryset
+
+ def get_leader(self, obj):
+ return InspectTeam.objects.filter(subtask=obj.subtask).first().member.pk
+
class InspectRecordCheckSerializer(serializers.ModelSerializer):
"""
@@ -99,9 +121,9 @@ class InspectRecordCheckSerializer(serializers.ModelSerializer):
def validate_result(self, result):
if result:
if result == '发现':
- if not (self.data.note or self.data.imgs):
- raise serializers.ValidationError('发现问题请填写说明或上传图片')
+ if not (self.initial_data['note'] or self.initial_data['imgs']):
+ raise ParseError('发现问题请填写说明或上传图片')
else:
- raise serializers.ValidationError('未填写检查结果')
+ raise ParseError('未填写检查结果')
return result
diff --git a/server/apps/quality/views.py b/server/apps/quality/views.py
index f5860c6..42b1f96 100644
--- a/server/apps/quality/views.py
+++ b/server/apps/quality/views.py
@@ -111,7 +111,7 @@ class SubtaskViewSet(PageOrNot, CreateUpdateCustomMixin, OptimizationMixin, Mode
子任务涉及的部门
"""
obj = self.get_object()
- data = obj.dept_subtask.filter(subtask=obj).values('dept', 'dept__name', 'state', 'subtask', 'note')
+ data = obj.dept_subtask.filter(subtask=obj).values('dept', 'dept__name', 'state', 'subtask', 'id')
return Response(data)
@action(methods=['get'], detail=True, perms_map = {'get':'*'})
@@ -162,14 +162,14 @@ class SubtaskViewSet(PageOrNot, CreateUpdateCustomMixin, OptimizationMixin, Mode
return Response('组织和成员不能为空', status=status.HTTP_400_BAD_REQUEST)
-class InspectDeptViewSet(GenericViewSet):
+class InspectDeptViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet):
"""
子任务对检查组织的提交
"""
perms_map = {'get':'*'}
queryset = InspectDept.objects.all()
serializer_class = InspectDeptSerializer
- @action(methods=['put'], detail=True, perms_map = {'put':'inspectdept_up'},
+ @action(methods=['put'], detail=True, perms_map = {'put':'inspectrecord_update'},
permission_classes=[IsAdminUser|IsSubInspectTaskLeader])
def up(self, request, *args, **kwargs):
"""
@@ -179,17 +179,18 @@ class InspectDeptViewSet(GenericViewSet):
if InspectRecord.objects.filter(checked=False, subtask=obj.subtask, dept=obj.dept).exists():
return Response('存在未完成检查记录', status=status.HTTP_400_BAD_REQUEST)
else:
- obj.note = request.data['note']
+ if 'note' in request.data and request.data['note']:
+ obj.note = request.data['note']
obj.state = '已提交'
obj.save()
- # 更新任务和子任务状态
+ # 更新主任务和子任务状态
if not InspectDept.objects.filter(subtask=obj.subtask).exlude(state='已提交').exists():
obj.subtask.state = '已完成'
obj.subtask.save()
if not SubInspectTask.objects.filter(inspecttask=obj.subtask.inspecttask).exclude(state='已完成').exists():
obj.subtask.inspecttask.state = '已完成'
obj.subtask.inspecttask.save()
- return Response(status=status.HTTP_200_OK)
+ return Response(InspectDeptSerializer(instance=obj).data, status=status.HTTP_200_OK)
class InspectRecordViewSet(PageOrNot, ModelViewSet):
@@ -205,7 +206,7 @@ class InspectRecordViewSet(PageOrNot, ModelViewSet):
return InspectRecordDetailSerializer
return InspectRecordListSerializer
- @action(methods=['post'], detail=False, perms_map = {'post':'inspectrecord_appoint'},
+ @action(methods=['post'], detail=False, perms_map = {'post':'inspectrecord_update'},
permission_classes=[IsAdminUser|IsSubInspectTaskLeader])
def appoint(self, request, *args, **kwargs):
"""
@@ -222,7 +223,7 @@ class InspectRecordViewSet(PageOrNot, ModelViewSet):
InspectRecord.objects.filter(item__in=items, subtask=subtask, checker__isnull=True).update(checker=checker)
return Response(data)
- @action(methods=['put'], detail=True, perms_map = {'put':'inspectrecord_check'},
+ @action(methods=['put'], detail=True, perms_map = {'put':'inspectrecord_update'},
permission_classes=[IsAdminUser|IsInspectRecordChecker|IsSubInspectTaskLeader])
def check(self, request, *args, **kwargs):
"""
@@ -231,7 +232,7 @@ class InspectRecordViewSet(PageOrNot, ModelViewSet):
instance = self.get_object()
serializer = InspectRecordCheckSerializer(instance, data=request.data)
serializer.is_valid(raise_exception=True)
- serializer.save(checker=request.user, checked=True)
+ serializer.save(checker=request.user, checked=True, check_time=timezone.now())
# 修改状态
insd = InspectDept.objects.get(subtask=instance.subtask, dept=instance.dept)
if insd.state == '待检查':
diff --git a/server/apps/system/serializers.py b/server/apps/system/serializers.py
index ab50bf7..888c9ae 100644
--- a/server/apps/system/serializers.py
+++ b/server/apps/system/serializers.py
@@ -152,4 +152,4 @@ class OrganizationSimpleSerializer(serializers.ModelSerializer):
class FileSimpleSerializer(serializers.ModelSerializer):
class Meta:
model = File
- fields = ['id', 'name', 'path']
\ No newline at end of file
+ fields = ['id', 'name', 'path', 'file']
\ No newline at end of file