初始化项目

README.md

@@ -1,4 +1,4 @@
-# zhishiku-mobile
+# recycle-mobile
 
 ## Project setup
 ```

package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "zhishiku-mobile",
+  "name": "recycle-mobile",
   "version": "0.1.0",
   "lockfileVersion": 1,
   "requires": true,

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "zhishiku-mobile",
+  "name": "recycle-mobile",
   "version": "0.1.0",
   "private": true,
   "devDependencies": {
@@ -114,7 +114,7 @@
     "Android >= 4.4",
     "ios >= 9"
   ],
-  "_id": "zhishiku-mobile@0.1.0",
+  "_id": "recycle-mobile@0.1.0",
   "readme": "ERROR: No README data found!",
   "resolutions": {
     "@babel/runtime": "~7.17.9"

src/api/exam/index.js

@@ -1,16 +0,0 @@
-<!-- 考试中心 -->
-<template>
-    <div>
-
-    </div>
-</template>
-
-<script>
-export default {
-
-}
-</script>
-
-<style lang="scss" scoped>
-
-</style>

src/api/index.js

@@ -1,5 +0,0 @@
-import $http from "common/http/index"
-
-export function getList(params) {
-  return $http.get('/home', params)
-}

src/api/learn/index.js

@@ -1,23 +0,0 @@
-<!-- 学习中心 -->
-<template>
-    <div>
-        <view style="padding: 20px;">
-            <u-button type="primary" text="确定"></u-button>
-            <u-button type="primary" loading loadingText="加载中"></u-button>
-            <u-button type="primary" icon="map" text="图标按钮"></u-button>
-            <u-button type="primary" shape="circle" text="按钮形状"></u-button>
-            <u-button text="渐变色按钮" color="linear-gradient(to right, rgb(66, 83, 216), rgb(213, 51, 186))"></u-button>
-            <u-button type="primary" size="small" text="大小尺寸"></u-button>
-        </view>
-    </div>
-</template>
-
-<script>
-export default {
-
-}
-</script>
-
-<style lang="scss" scoped>
-
-</style>

src/api/profile/index.js

@@ -1,16 +0,0 @@
-<!-- 我的主页 -->
-<template>
-    <div>
-
-    </div>
-</template>
-
-<script>
-export default {
-
-}
-</script>
-
-<style lang="scss" scoped>
-
-</style>

src/api/wiki/index.js

@@ -1,16 +0,0 @@
-<!-- 百科知识 -->
-<template>
-    <div>
-
-    </div>
-</template>
-
-<script>
-export default {
-
-}
-</script>
-
-<style lang="scss" scoped>
-
-</style>

src/common/http/index.js

@@ -108,7 +108,6 @@ function postJson(url, data) {
 }
 
 function get(url, data) {
-
   return $http(url, 'GET', data)
 }
 

src/common/utils/common.js

@@ -0,0 +1,224 @@
+// 不含icon提示框
+export const toast = str => {
+	return new Promise((resolve, reject) => {
+		if(str.length < 20) {
+			uni.showToast({
+				title: str,
+				icon: "none",
+				duration: 1500,
+				success: () => {
+					setTimeout(() => {
+						resolve
+					}, 1500)
+				}
+			})
+		}
+		else {
+			uni.showModal({
+				title: "提示",
+				content: String(str),
+				showCancel: false,
+				confirmText: "我知道了",
+				success(res) {
+					if (res.confirm) {
+						resolve(res);
+					} else {
+						reject();
+					}
+				}
+			});
+		}
+	})
+};
+
+// 成功提示框
+export const successToast = (str) => {
+	return new Promise((resolve, reject) => {
+		uni.showToast({
+			title: str || '请求成功',
+			icon: 'success',
+			duration: 1500,
+			success: () => {
+				setTimeout(() => {
+					resolve();
+				}, 1500);
+			},
+		});
+	});
+};
+
+// loading
+export const showLoading = () => {
+	return new Promise((resolve, reject) => {
+		uni.showLoading({
+			success: () => {
+				resolve();
+			},
+		});
+	});
+};
+
+// 提示loading
+export const tipLoading = (str) => {
+	return new Promise((resolve, reject) => {
+		uni.showLoading({
+			title: str,
+			success: () => {
+				resolve();
+			},
+		});
+	});
+};
+
+// 隐藏loading
+export const hideLoading = () => {
+	return new Promise((resolve, reject) => {
+		uni.hideLoading({
+			success: () => {
+				resolve();
+			},
+		});
+	});
+};
+
+// 模态弹窗
+export const modal = (options = {}) => {
+	if (!options) return;
+	const {
+		title,
+		content,
+		showCancel,
+		cancelText,
+		cancelColor,
+		confirmText,
+		confirmColor,
+	} = Object.assign({}, options.content ? options : {
+		content: options
+	});
+	return new Promise((resolve, reject) => {
+		uni.showModal({
+			title: title || '提示',
+			content: String(content),
+			showCancel: typeof showCancel == 'boolean' ? showCancel : true,
+			cancelText: cancelText || '取消',
+			cancelColor: cancelColor || '#323233',
+			confirmText: confirmText || '确定',
+			confirmColor: confirmColor || '#3D8FFD',
+			complete(res) {
+				if (res.confirm) {
+					resolve(res);
+				} else {
+					reject();
+				}
+			},
+		});
+	});
+};
+
+/**
+ * 跳转页面 navigateTo
+ * 保留当前页面，跳转到应用内的某个页面
+ * @param {String} url 需要跳转的页面
+ * @param {Boolean} isAuth 是否需要鉴权
+ * @returns
+ */
+export const navPage = (url, isAuth = 0) => {
+	if ((isAuth && store.state.isLogin) || !isAuth) {
+		uni.navigateTo({
+			url,
+			fail: (err) => {
+				console.log('页面跳转失败', url, err);
+			},
+		});
+	} else {
+		uni.navigateTo({
+			url: '/pages/login/index',
+		});
+	}
+};
+
+/**
+ * 跳转页面 redirectTo
+ * 关闭当前页面，跳转到应用内的某个页面
+ * @param {String} url 需要跳转的页面
+ * @param {Boolean} isAuth 是否需要鉴权
+ * @returns
+ */
+export const redPage = (url, isAuth = 0) => {
+	if ((isAuth && store.state.isLogin) || !isAuth) {
+		uni.redirectTo({
+			url,
+			fail: (err) => {
+				console.log('页面跳转失败', url, err);
+			},
+		});
+	} else {
+		uni.navigateTo({
+			url: '/pages/login/index',
+		});
+	}
+};
+
+/**
+ * 返回页面
+ * @param {Number} num 返回的页面数
+ * @param {Number} time 延时返回
+ * @returns
+ */
+export const backPage = (num = 1, time = 0) => {
+	if (!num) return false;
+	setTimeout(() => {
+		uni.navigateBack({
+			delta: num,
+		});
+	}, time);
+};
+
+/**
+ * 拨打电话
+ * @param {String} phone 用户隐私号
+ * @param {String} orderId 服务单id，如果需要请求记录接口
+ */
+export const callPhone = (phone) => {
+	if (!phone)
+		return modal({
+				content: '手机号码不存在',
+				showCancel: false,
+			})
+			.then(() => {})
+			.catch(() => {});
+	uni.makePhoneCall({
+		phoneNumber: phone,
+		success: () => {
+			// logCallPhone(orderId);
+		},
+	});
+};
+
+/**
+ * 复制
+ * @param {String} val 复制内容
+ */
+export const copy = (val) => {
+	uni.setClipboardData({
+		data: val,
+		success: () => {
+			successToast('复制成功');
+		},
+	});
+};
+
+
+export default {
+	toast,
+	successToast,
+	showLoading,
+	tipLoading,
+	hideLoading,
+	modal,
+	navPage,
+	redPage,
+	backPage,
+	callPhone,
+	copy
+};

src/common/utils/prompt.js

@@ -1,83 +0,0 @@
-/**
- * 交互反馈
- */
-
-export default {
-  toast(options = {}) {
-    if (!options) return;
-    const { title, icon, image, mask, duration, position } = Object.assign(
-      {},
-      options.title ? options : { title: options }
-    );
-    return new Promise((resolve, reject) => {
-      uni.showToast({
-        title,
-        icon: icon || "none",
-        image,
-        mask,
-        duration: duration || 2000,
-        position,
-        success(res) {
-          setTimeout(() => {
-            resolve(res);
-          }, 100);
-        },
-        fail() {
-          reject();
-        }
-      });
-    });
-  },
-  loading(options) {
-    const { title, mask } = Object.assign(
-      {},
-      typeof options == "string" ? { title: options } : { ...options }
-    );
-    return new Promise((resolve, reject) => {
-      uni.showLoading({
-        title: title || "",
-        mask: typeof mask == "boolean" ? mask : true,
-        success(res) {
-          resolve(res);
-        },
-        fail() {
-          reject();
-        }
-      });
-    });
-  },
-  clear(options = {}) {
-    if (!options) return;
-    uni.hideLoading();
-  },
-  modal(options = {}) {
-    if (!options) return;
-    const {
-      title,
-      content,
-      showCancel,
-      cancelText,
-      cancelColor,
-      confirmText,
-      confirmColor
-    } = Object.assign({}, options.content ? options : { content: options });
-    return new Promise((resolve, reject) => {
-      uni.showModal({
-        title: title || "",
-        content: String(content),
-        showCancel: typeof showCancel == "boolean" ? showCancel : true,
-        cancelText: cancelText || "取消",
-        cancelColor: cancelColor || "#323233",
-        confirmText: confirmText || "确定",
-        confirmColor: confirmColor || "#3388ff",
-        complete(res) {
-          if (res.confirm) {
-            resolve(res);
-          } else {
-            reject();
-          }
-        }
-      });
-    });
-  }
-};

src/common/utils/util.js

@@ -10,7 +10,7 @@ export const getUserInfo = () => {
         const {
           data
         } = response;
-        uni.setStorageSync('knowledge_mobile_user', data);
+        uni.setStorageSync('recycle_mobile_user', data);
         resolve(data);
       })
       .catch((error) => {

src/components/zj-container/zj-page-layout.vue

@@ -0,0 +1,121 @@
+<template>
+	<view
+		class="app-container"
+		:class="hasFooter || isTabbar ? '':'pb'"
+		:style="{background: bgColor, height: 'calc(100vh - ' + (isTabbar ? '94' : '44') + 'px)'}">
+		<u-loading-page
+			loading-text="家盛茂工程师"
+			color="#333333"
+			fontSize="17"
+			image="/static/images/logo.png"
+			icon-size="44"
+			:loading="isLoading">
+		</u-loading-page>
+
+		<block v-if="!isLoading">
+			<view class="header-container">
+				<slot name="header"></slot>
+			</view>
+			<view class="content-container">
+				<template v-if="isScroll">
+					<scroll-view
+						scroll-y
+						enable-flex
+						refresher-enabled
+						style="width: 100%; height: 100%; box-sizing: border-box;"
+						@scrolltoupper="(...p)=>{$emit('scrolltoupper',p)}"
+						@scrolltolower="(...p)=>{$emit('scrolltolower',p)}"
+						@scroll="(...p)=>{$emit('scroll',p)}"
+						@refresherpulling="(...p)=>{$emit('refresherpulling',p)}"
+						@refresherrefresh="(...p)=>{$emit('refresherrefresh',p)}"
+						@refresherrestore="(...p)=>{$emit('refresherrestore',p)}"
+						@refresherabort="(...p)=>{$emit('refresherabort',p)}"
+						:refresher-triggered="refresherTriggered">
+						<slot></slot>
+					</scroll-view>
+				</template>
+				<template v-else>
+					<view style="width: 100%; height: 100%; box-sizing: border-box; overflow-y: scroll;">
+						<slot></slot>
+					</view>
+				</template>
+			</view>
+			<view class="footer-container" v-if="hasFooter">
+				<slot name="footer"></slot>
+			</view>
+		</block>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			bgColor: {
+				type: String,
+				default: '#F3F4F8',
+			},
+			hasFooter: {
+				type: Boolean,
+				default: false,
+			},
+			isScroll: {
+				type: Boolean,
+				default: false,
+			},
+			refresherTriggered: {
+				type: Boolean,
+				default: false,
+			},
+			isLoading: {
+				type: Boolean,
+				default: false,
+			}
+		},
+
+		computed: {
+			isTabbar() {
+				let pages = getCurrentPages();
+				if(pages.length > 0) {
+					let prevPage = pages[pages.length - 1];
+					if (prevPage.route === 'pages/index/index' || prevPage.route === 'pages/issue/index' || prevPage.route === 'pages/message/index' || prevPage.route === 'pages/mine/index') {
+						return true;
+					}else {
+						return false;
+					}
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	::v-deep .u-loading-page {
+		z-index: 999999;
+	}
+	.app-container {
+		width: 100%;
+    height: 100vh;
+		box-sizing: border-box;
+		display: flex;
+		flex-direction: column;
+		&.pb {
+			padding-bottom: env(safe-area-inset-bottom);
+		}
+		.header-container {
+			flex-shrink: 0;
+		}
+		.content-container {
+			flex: 1;
+			height: 0;
+		}
+		.footer-container {
+			flex-shrink: 0;
+			padding-bottom: env(safe-area-inset-bottom);
+			background: #ffffff;
+			box-sizing: border-box;
+			box-shadow: $bottom-shadow;
+			position: relative;
+			z-index: 1;
+		}
+	}
+</style>

src/components/zj/FileViewer/FileViewer.vue

@@ -1,89 +0,0 @@
-<template>
-  <view class="">
-    <u-sticky>
-      <view class="control">
-        <ul>
-          <li v-for="(v,i) in fileList" :key="i" @click='changeImg(v,i)'>
-            <image class="li_img" src="@/static/common/word.png" v-if="$checkFileType(v.url) == 'word'"></image>
-            <image class="li_img" src="@/static/common/excel.png" v-if="$checkFileType(v.url) == 'excel'"></image>
-            <image class="li_img" src="@/static/common/ppt.png" v-if="$checkFileType(v.url) == 'ppt'"></image>
-            <image class="li_img" src="@/static/common/pdf.png" v-if="$checkFileType(v.url) == 'pdf'"></image>
-            <image class="li_img" :src="$imageUrl+v.url" v-if="$checkFileType(v.url) == 'img'"></image>
-            <image class="li_img" src="@/static/common/video.png" v-if="$checkFileType(v.url) == 'video'"></image>
-          </li>
-        </ul>
-      </view>
-    </u-sticky>
-
-    <br>
-    <video style="width: 100%;" v-if="$checkFileType(showUrl) == 'video'" :src="showUrl"></video>
-    <iframe v-if="$checkFileType(showUrl) !== 'video' && showUrl !== ''" :src="xdocUrl+encodeURIComponent(showUrl)"
-      frameborder=" 0" width='100%' style='height: calc(100vh - 25vh ) ;'></iframe>
-  </view>
-</template>
-
-<script>
-  export default {
-    props: {
-      fileList: {
-        type: Array,
-        required: true
-      }
-    },
-    data() {
-      return {
-        xdocUrl: 'https://view.xdocin.com/view?src=',
-        showUrl: '',
-      }
-    },
-    created() {},
-    methods: {
-      init() {
-        this.$nextTick(() => {
-          this.changeImg(this.fileList[0], 0);
-        })
-
-      },
-      async changeImg(item, index) {
-        let params = {
-          key: item.url,
-        }
-        let {
-          data
-        } = await this.$api.get('/file/path/get', params)
-        this.showUrl = data
-      },
-    }
-  }
-</script>
-
-<style scoped lang="scss">
-  .control {
-    background-color: #fff;
-    padding: 20rpx 0;
-
-    ul {
-
-      padding: 0;
-      list-style: none;
-      display: flex;
-      justify-content: flex-start;
-      align-items: center;
-      overflow-x: auto;
-      overflow-y: hidden;
-
-      li {
-        height: 160rpx;
-        width: 160rpx;
-        margin: 0 20rpx;
-      }
-    }
-
-
-    .li_img {
-      height: 160rpx;
-      width: 160rpx;
-
-    }
-  }
-</style>

src/components/zj/cell/cell.vue

@@ -1,101 +0,0 @@
-<template>
-    <my-link :to="to">
-        <view class="cell">
-            <view class="cell-img">
-                <u--image :showLoading="true" src="https://cdn.uviewui.com/uview/album/1.jpg" width="90px"
-                    height="90px">
-                </u--image>
-            </view>
-            <view class="cell-info">
-                <view class="cell-info-content">
-                    <view class="cell-info-content-title">智能空调维修干货来了【必修】</view>
-                    <view class="cell-info-content-name">产品品牌：格力GREE</view>
-                </view>
-                <view class="cell-info-tip">
-                    <template v-if="moudles === 'cou'">
-                        <view class="cell-info-tip-date">2022-11-01</view>
-                        <view class="cell-info-tip-status">未开始</view>
-                    </template>
-                    <template v-else>
-                        <view class="cell-info-tip-date">浏览数：0 </view>
-                        <view class="cell-info-tip-date">下载积分：0</view>
-                    </template>
-                </view>
-            </view>
-        </view>
-    </my-link>
-</template>
-
-<script>
-export default {
-    props:{
-        to:{
-            type:Object,
-            default:()=>{
-                return {
-
-                }
-            }
-        }
-    },
-    data() {
-        return {
-            moudles: ''
-        }
-    }
-}
-</script>
-
-<style lang="scss" scoped>
-.cell {
-    display: flex;
-    padding: 30rpx;
-    height: 180rpx;
-    align-items: center;
-    border-radius: 20rpx;
-    background-color: #fff;
-
-    &-img {
-        position: relative;
-    }
-
-    &-info {
-        display: flex;
-        flex: 1;
-        height: inherit;
-        flex-direction: column;
-        padding-left: 20rpx;
-        justify-content: space-between;
-
-        &-content {
-            &-title {
-                font-size: 28rpx;
-                color: #333333;
-            }
-
-            &-name {
-                margin: 20rpx 0;
-                font-size: 24rpx;
-                color: #333333;
-
-            }
-        }
-
-        &-tip {
-            display: flex;
-            justify-content: space-between;
-
-            &-date {
-                font-size: 24rpx;
-                color: #999999;
-            }
-
-            &-status {
-                font-size: 24rpx;
-                color: #e95505;
-
-            }
-        }
-    }
-}
-</style>

src/components/zj/list-file/list-file.vue

@@ -1,131 +0,0 @@
-<template>
-
-  <view class="">
-    <u-list @scrolltolower="scrolltolower">
-      <u-list-item v-for="(item, index) in dataList" :key="index">
-        <view class="list" @click="toDetailFn(item.disciplineId)">
-          <view class="list_top">
-            <view :style="{ [direction]: '0px' }" class="tag">
-              推荐
-            </view>
-            <u--image :showLoading="true" :src="$imageUrl+item.imageUrl" width="100%" height="332rpx">
-            </u--image>
-          </view>
-          <view class="list_bottom">
-            <view class="fl">
-
-              <u--text :lines="1" :text="item.chooseFlag ===0 ? '【必修】':'【选修】' +item.disciplineName">
-              </u--text>
-            </view>
-
-
-          </view>
-          <view class="fr">
-            {{item.updateTime}}
-          </view>
-
-        </view>
-      </u-list-item>
-    </u-list>
-  </view>
-
-</template>
-
-<script>
-  export default {
-
-    data() {
-      return {
-        dataList: [],
-        pageNum: 1,
-        pageSize: 10,
-      }
-    },
-    props: {
-      direction: {
-        type: String,
-        default: 'left'
-      },
-      keyword: {
-        type: String,
-        default: ''
-      }
-    },
-    created() {
-      this.getList()
-    },
-    methods: {
-      //获取聊表数据
-      async getList() {
-        let params = {
-          "brandCode": [],
-          "entryName": this.keyword,
-          "pageNum": this.pageNum,
-          "pageSize": this.pageSize,
-          "source": 1
-        }
-        let {
-          data
-        } = await this.$api.post('/discipline/get-ypreferred', params)
-        this.dataList = [...this.dataList, ...data.records]
-
-      },
-      //
-      toDetailFn(disciplineId) {
-        this.$router.push({
-          name: "learnDetail",
-          query: {
-            disciplineId
-          },
-        })
-      },
-      scrolltolower() {
-        this.pageNum++
-        this.getList()
-      },
-
-
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  .list {
-    .list_top {
-      position: relative;
-
-      .tag {
-        position: absolute;
-        top: 0rpx;
-        z-index: 10;
-        font-size: 14rpx;
-        background-color: #F98640;
-        width: 80rpx;
-        height: 36rpx;
-        text-align: center;
-        color: #fff;
-        line-height: 36rpx;
-      }
-    }
-
-    .list_bottom {
-      padding: 22rpx 0rpx;
-      overflow: hidden;
-      line-height: 100%;
-      font-size: 28rpx;
-
-      .fl {
-        float: left;
-      }
-
-
-    }
-  }
-
-  .fr {
-    font-size: 28rpx;
-    float: right;
-    color: #A7A7A7;
-    margin-bottom: 20rpx;
-  }
-</style>

src/components/zj/list-view/list-view.vue

@@ -1,124 +0,0 @@
-<template>
-    <view class="u-page">
-        <view class="header">
-            <view class="search">
-                <slot name="search">
-                    <!-- <u-search clearabled show-action shape="square" placeholder="搜索" v-model="keyword">
-                </u-search> -->
-                </slot>
-            </view>
-            <view class="subsection">
-                <slot name="subsection">
-                    <!-- <u-subsection mode="subsection" :list="titleList" :current="current" @change="sectionChange">
-                    </u-subsection> -->
-                </slot>
-            </view>
-            <view class="tabs">
-                <slot name="tabs"></slot>
-            </view>
-        </view>
-        <view class="main" :style="{ height: mainHeight }">
-            <view style="height:100%">
-                <swiper :style="{ height: mainHeight }" @change="swiperChange" :current="current"
-                    :disable-touch="titleList.length === 1">
-                    <swiper-item v-for="index in titleList.length" :key="index">
-                        <u-list @scrolltolower="scrolltolower" class="list">
-                            <u-list-item v-for="(item, index) in dataList" :key="index">
-                                <slot name="content" v-bind:item="item"></slot>
-                            </u-list-item>
-                            <!-- 防止最后一个元素被遮盖 -->
-                            <view v-if="isLast" :style="{ marginBottom: mgb }"></view>
-                        </u-list>
-                    </swiper-item>
-                </swiper>
-            </view>
-        </view>
-    </view>
-</template>
-
-<script>
-
-export default {
-    props: {
-        isLast: {
-            type: Boolean,
-            default: false
-        },
-        mgb: {
-            type: String,
-            default: '230rpx'
-        },
-        curNum: {
-            type: Number | String,
-            default: 0
-        },
-        titleList: {
-            type: Array,
-            default: () => {
-                return ['产品话术', '故障代码', '说明说']
-            }
-        }
-    },
-    data() {
-        return {
-            dataList: [],
-            urls: [
-                'https://cdn.uviewui.com/uview/album/1.jpg',
-                'https://cdn.uviewui.com/uview/album/2.jpg',
-                'https://cdn.uviewui.com/uview/album/3.jpg',
-                'https://cdn.uviewui.com/uview/album/4.jpg',
-                'https://cdn.uviewui.com/uview/album/5.jpg',
-                'https://cdn.uviewui.com/uview/album/6.jpg',
-                'https://cdn.uviewui.com/uview/album/7.jpg',
-                'https://cdn.uviewui.com/uview/album/8.jpg',
-                'https://cdn.uviewui.com/uview/album/9.jpg',
-                'https://cdn.uviewui.com/uview/album/10.jpg',
-            ],
-            keyword: '',
-            mainHeight: '100vh',
-            current: 0
-        }
-    },
-
-    created() {
-        this.loadmore()
-    },
-
-    mounted() {
-        const self = this
-        this.current = this.curNum
-        uni.getSystemInfo({
-            success: function (res) {
-                this.windowHeight = res.windowHeight
-                let info = uni.createSelectorQuery().select('.header')
-                info.boundingClientRect(data => {
-                    self.mainHeight = res.windowHeight - data.height + 'px'
-                }).exec()
-            }
-        });
-    },
-    methods: {
-        scrolltolower() {
-            this.loadmore()
-        },
-        loadmore() {
-            for (let i = 0; i < 30; i++) {
-                this.dataList.push({
-                    url: this.urls[uni.$u.random(0, this.urls.length - 1)]
-                })
-            }
-        },
-        sectionChange(index) {
-            this.current = index
-        },
-        swiperChange({ detail: { current } }) {
-            this.current = current
-        }
-    }
-
-}
-</script>
-
-<style lang="scss">
-
-</style>

src/components/zj/message-board/message-board.vue

@@ -1,115 +0,0 @@
-<!-- 留言板 -->
-<template>
-    <view class="message">
-        <view class="message-title">
-            <view><text>讨论区</text> <text class="message-title-tip">文明上网、理性发言、请遵守企业发言纪律</text></view>
-        </view>
-        <view class="message-info">
-            <view class="message-info-user">
-                <view class="message-info-user-avatar">
-                    <u-avatar src="https://cdn.uviewui.com/uview/album/5.jpg" size="30"></u-avatar>
-                </view>
-                <view class="message-info-user-info">
-                    <view>李海（S21000714897）</view>
-                    <view>广州嘉讯茂机电工程有限公司（S2100071）</view>
-                </view>
-            </view>
-            <view class="message-info-content">我已通过努力学习视频内容，已经顺利通过考试，获取到维修技能等级证书！</view>
-            <view class="message-info-date">2022-11-02 12:45:08</view>
-        </view>
-        <view class="message-input" :class="isFixed ? 'fixed' : ''">
-            <u--input maxlength="200" placeholder="我的评论" border="surround" v-model="conent"></u--input>
-            <u-button class="message-input-btn" type="primary" shape="square" text="发表"></u-button>
-        </view>
-    </view>
-</template>
-
-<script>
-
-export default {
-    props: {
-        isFixed: {
-            type: Boolean,
-            default: false
-        }
-    },
-    data() {
-        return {
-            conent: ''
-        }
-    }
-}
-</script>
-
-<style lang="scss" scoped>
-.message {
-    background-color: #fff;
-
-    &-title {
-        height: 88rpx;
-        padding: 0 30rpx;
-        line-height: 88rpx;
-        color: #333333;
-
-        &-tip {
-            margin-left: 25rpx;
-            font-size: 24rpx;
-            color: #666666;
-        }
-    }
-
-    &-info {
-        margin: 0 30rpx;
-        padding: 18rpx 0;
-        background-color: #fff;
-        border-top: #e5e5e5 solid 1rpx;
-
-        &-user {
-            display: flex;
-            padding-bottom: 22rpx;
-
-            &-info {
-                padding-left: 20rpx;
-                line-height: 34rpx;
-                font-size: 24rpx;
-                color: #333333;
-            }
-        }
-
-        &-content {
-            font-size: 24rpx;
-            color: #666666;
-            line-height: 36rpx;
-        }
-
-        &-date {
-            padding-top: 20rpx;
-            font-size: 24rpx;
-            color: #999999;
-
-        }
-    }
-
-    &-input {
-
-        display: flex;
-        padding: 20rpx;
-        height: 64rpx;
-        background-color: #fff;
-
-        &-btn {
-            width: 132rpx;
-            height: 64rpx;
-            margin-left: 10rpx;
-
-        }
-    }
-
-    .fixed {
-        position: fixed;
-        bottom: 0;
-        left: 0;
-        width: calc(100vw - 40rpx);
-    }
-}
-</style>

src/components/zj/navbar/index.vue

@@ -1,15 +0,0 @@
-<template>
-    <div>
-ddddd
-    </div>
-</template>
-
-<script>
-    export default {
-        
-    }
-</script>
-
-<style lang="scss" scoped>
-
-</style>

src/main.js

@@ -9,7 +9,6 @@ import {
 } from 'router'
 Vue.use(router)
 import pages from 'mixins';
-import prompt from "common/utils/prompt"
 import Mylink from 'uni-simple-router/dist/link.vue'
 
 Vue.config.productionTip = false
@@ -19,8 +18,31 @@ import {
 } from 'js-base64'
 Vue.prototype.$Base64 = Base64
 
-// 交互反馈
-Vue.prototype.$Prompt = prompt;
+import {
+	toast,
+	successToast,
+	showLoading,
+	tipLoading,
+	hideLoading,
+	modal,
+	navPage,
+	redPage,
+	backPage,
+	callPhone,
+	copy,
+} from "common/utils/common"
+Vue.prototype.$toast = toast;
+Vue.prototype.$successToast = successToast;
+Vue.prototype.$showLoading = showLoading;
+Vue.prototype.$tipLoading = tipLoading;
+Vue.prototype.$hideLoading = hideLoading;
+Vue.prototype.$modal = modal;
+Vue.prototype.$navPage = navPage;
+Vue.prototype.$redPage = redPage;
+Vue.prototype.$backPage = backPage;
+Vue.prototype.$callPhone = callPhone;
+Vue.prototype.$copy = copy;
+
 // 注入全局
 Vue.mixin(pages);
 

src/manifest.json

@@ -1,5 +1,5 @@
 {
-  "name": "zhishiku",
+  "name": "recycle",
   "appid": "",
   "description": "",
   "versionName": "1.0.0",

src/packages/learn/index.vue

@@ -1,23 +0,0 @@
-<!-- 学习中心 -->
-<template>
-    <div>
-        <view style="padding: 20px;">
-            <u-button type="primary" text="确定"></u-button>
-            <u-button type="primary" loading loadingText="加载中"></u-button>
-            <u-button type="primary" icon="map" text="图标按钮"></u-button>
-            <u-button type="primary" shape="circle" text="按钮形状"></u-button>
-            <u-button text="渐变色按钮" color="linear-gradient(to right, rgb(66, 83, 216), rgb(213, 51, 186))"></u-button>
-            <u-button type="primary" size="small" text="大小尺寸"></u-button>
-        </view>
-    </div>
-</template>
-
-<script>
-export default {
-
-}
-</script>
-
-<style lang="scss" scoped>
-
-</style>

src/packages/profile/case/details.vue

@@ -1,135 +0,0 @@
-<template>
-  <view class="container">
-    <view class="details">
-      <view class="details-top">
-        <view class="details-img">
-          <u--image :showLoading="true" src="https://cdn.uviewui.com/uview/album/1.jpg" width="100%" height="350rpx"
-            @click="click"></u--image>
-        </view>
-        <view class="details-top-content">
-          <view class="details-top-content-title">
-            “格力”手机APP，智能WIFI连接教程
-          </view>
-          <view class="details-top-content-brand">品牌：格力GREE</view>
-          <view class="details-top-content-text">上传人：张海（S21000715987） </view>
-          <view class="details-top-content-text">发布时间：2022-11-06 14:20:43</view>
-          <view class="details-top-content-text">浏览数：1 </view>
-          <view class="details-top-content-text">
-            <text>下载积分：10</text>
-            <text></text>
-          </view>
-        </view>
-      </view>
-      <view class="details-bottom">
-        <view class="details-bottom-content">
-          1、空调器的组成 空调器主要由制冷循环系统、空气循环系统和电气控制系统三部 分组成。制冷循环系统是由压缩机、冷凝器、蒸发器、节流装置 (毛细管)等组成，采用热泵系统的还有换向阀(四通阀)。空气循环
-          系统包括风机、滤尘网和风口百叶等。
-        </view>
-        <view class="details-img">
-          <u--image :showLoading="true" src="https://cdn.uviewui.com/uview/album/1.jpg" width="100%" height="350rpx"
-            @click="click"></u--image>
-        </view>
-        <view class="details-download">
-          <view class="details-download-title">附件下载</view>
-          <view class="details-download-name">
-            <text>维修技能等级谁（一）.MP4</text>
-            <text>
-              <u-icon name="download" color="#6da7ff" size="28"></u-icon>
-            </text>
-          </view>
-        </view>
-      </view>
-    </view>
-    <!-- 留言板 -->
-    <!-- <zj-message-board></zj-message-board> -->
-  </view>
-</template>
-
-<script>
-  export default {
-
-  }
-</script>
-
-<style lang="scss" scoped>
-  .details {
-
-    // margin-bottom: 20rpx;
-    &-img {
-      height: 350rpx;
-    }
-
-    &-top {
-
-      background-color: #fff;
-
-      &-content {
-        margin: 0 28rpx;
-        padding: 10rpx 0;
-        border-bottom: #e5e5e5 solid 1rpx;
-        background-color: #fff;
-
-        &-title {
-          height: 30rpx;
-          padding: 20rpx 0;
-          line-height: 30rpx;
-          font-size: 28rpx;
-          color: #333333;
-
-        }
-
-        &-brand {
-          height: 24rpx;
-          padding: 10rpx 0;
-          font-size: 24rpx;
-          color: #333333;
-          line-height: 24rpx;
-        }
-
-        &-text {
-          padding: 4rpx 0;
-          font-size: 24rpx;
-          color: #666666;
-          line-height: 24rpx;
-        }
-      }
-    }
-
-    &-bottom {
-      &-content {
-        padding: 20rpx;
-        font-size: 24rpx;
-        color: #333333;
-        line-height: 36rpx;
-        background-color: #fff;
-      }
-
-    }
-
-    &-download {
-      padding: 20rpx;
-      background-color: #fff;
-
-      &-title,
-      &-name {
-        padding: 10rpx 0;
-
-      }
-
-      &-title {
-        font-size: 24rpx;
-        color: #666666;
-        line-height: 28rpx;
-      }
-
-      &-name {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        font-size: 24rpx;
-        color: #6da7ff;
-        line-height: 28rpx;
-      }
-    }
-  }
-</style>

src/pages.json

@@ -18,325 +18,49 @@
       }
     },
     {
-      "path": "pages/learn/index",
-      "name": "learn",
+      "path": "pages/index/index",
+      "name": "home",
       "style": {
-        "navigationBarTitleText": "学习中心",
-        "enablePullDownRefresh": true
+        "navigationBarTitleText": "首页"
       }
     },
-    {
-      "path": "pages/learn/components/learnDetail",
-      "name": "learnDetail",
-      "style": {
-        "navigationBarTitleText": "智能学习平台"
-      }
-    },
-    {
-      "path": "pages/learn/components/specialDetail",
-      "name": "specialDetail",
-      "style": {
-        "navigationBarTitleText": "智能学习平台"
-      }
-    },
-    {
-      "path": "pages/learn/components/study",
-      "name": "study",
-      "style": {
-        "navigationBarTitleText": "智能学习平台"
 
-      }
-    },
-    {
-      "path": "pages/learn/components/exam",
-      "name": "exam",
-      "style": {
-        "navigationBarTitleText": "智能学习平台"
-      }
-    },
-    {
-      "path": "pages/learn/components/examDetail",
-      "name": "examDetail",
-      "style": {
-        "navigationBarTitleText": "智能学习平台"
-      }
-    },
-    {
-      "path": "pages/learn/components/examRecord",
-      "name": "examRecord",
-      "style": {
-        "navigationBarTitleText": "考试记录",
-        "enablePullDownRefresh": true
-      }
-    },
-    {
-      "path": "pages/learn/components/answerAnalysis",
-      "name": "answerAnalysis",
-      "style": {
-        "navigationBarTitleText": "答案解析"
-      }
-    },
-    {
-      "path": "pages/wiki/index",
-      "name": "wiki",
-      "style": {
-        "navigationBarTitleText": "百科知识"
-      }
-    },
-    {
-      "path": "pages/wiki/components/scripts",
-      "name": "scripts",
-      "style": {
-        "navigationBarTitleText": "产品话术",
-        "enablePullDownRefresh": true
-      }
-    },
     {
-      "path": "pages/wiki/components/faultcode",
-      "name": "faultcode",
+      "path": "pages/issue/index",
+      "name": "issue",
       "style": {
-        "navigationBarTitleText": "故障代码",
-        "enablePullDownRefresh": true
-      }
-    },
-    {
-      "path": "pages/wiki/components/instructions",
-      "name": "instructions",
-      "style": {
-        "navigationBarTitleText": "说明书",
-        "enablePullDownRefresh": true
-      }
-    },
-    {
-      "path": "pages/wiki/components/instructionsDetail",
-      "name": "instructionsDetail",
-      "style": {
-        "navigationBarTitleText": "说明书详情"
-      }
-    },
-    {
-      "path": "pages/wiki/components/train",
-      "name": "train",
-      "style": {
-        "navigationBarTitleText": "培训资料",
-        "enablePullDownRefresh": true
-      }
-    },
-    {
-      "path": "pages/wiki/components/video",
-      "name": "video",
-      "style": {
-        "navigationBarTitleText": "视频资料",
-        "enablePullDownRefresh": true
+        "navigationBarTitleText": "发布"
       }
     },
+
     {
-      "path": "pages/exam/index",
-      "name": "exam",
+      "path": "pages/message/index",
+      "name": "message",
       "style": {
-        "navigationBarTitleText": "考试中心"
+        "navigationBarTitleText": "消息"
       }
     },
     {
-      "path": "pages/profile/index",
-      "name": "profile",
+      "path": "pages/mine/index",
+      "name": "mine",
       "style": {
         "navigationStyle": "custom",
-        "navigationBarTitleText": "我的主页"
-      }
-    },
-    {
-      "path": "pages/profile/study/index",
-      "name": "study",
-      "style": {
-        "navigationBarTitleText": "要学",
-        "enablePullDownRefresh": true
-      }
-    },
-    {
-      "path": "pages/profile/examination/index",
-      "name": "examination",
-      "style": {
-        "navigationBarTitleText": "要考",
-        "enablePullDownRefresh": true
-      }
-    },
-    {
-      "path": "pages/profile/lesson/index",
-      "name": "lesson",
-      "style": {
-        "navigationBarTitleText": "我的课程",
-        "enablePullDownRefresh": true
-      }
-    },
-    {
-      "path": "pages/profile/special/index",
-      "name": "special",
-      "style": {
-        "navigationBarTitleText": "我的专题",
-        "enablePullDownRefresh": true
-      }
-    },
-    {
-      "path": "pages/profile/other/index",
-      "name": "other",
-      "style": {
-        "navigationBarTitleText": "其他学习"
-      }
-    },
-    {
-      "path": "pages/profile/collect/index",
-      "name": "collect",
-      "style": {
-        "navigationBarTitleText": "我的收藏",
-        "enablePullDownRefresh": true
-      }
-    },
-    {
-      "path": "pages/profile/case/index",
-      "name": "case",
-      "style": {
-        "navigationBarTitleText": "我的案例",
-        "enablePullDownRefresh": true
-      }
-    },
-    {
-      "path": "pages/profile/shop/index",
-      "name": "shop",
-      "style": {
-        "navigationBarTitleText": "积分兑换",
-        "enablePullDownRefresh": true
-      }
-    },
-    {
-      "path": "pages/profile/shop/myScore",
-      "name": "myScore",
-      "style": {
-        "navigationBarTitleText": "我的积分",
-        "enablePullDownRefresh": true
-      }
-    },
-    {
-      "path": "pages/profile/shop/goodsList",
-      "name": "goodsList",
-      "style": {
-        "navigationBarTitleText": "所有商品",
-        "enablePullDownRefresh": true
-      }
-    },
-    {
-      "path": "pages/profile/shop/goodsDetail",
-      "name": "goodsDetail",
-      "style": {
-        "navigationBarTitleText": "商品详情"
-      }
-    },
-    {
-      "path": "pages/profile/shop/confirmOrder",
-      "name": "confirmOrder",
-      "style": {
-        "navigationBarTitleText": "确认订单"
-      }
-    },
-    {
-      "path": "pages/profile/shop/receiptAddress",
-      "name": "receiptAddress",
-      "style": {
-        "navigationBarTitleText": "收货地址"
-      }
-    },
-    {
-      "path": "pages/profile/shop/addAddress",
-      "name": "addAddress",
-      "style": {
-        "navigationBarTitleText": "新增收货地址"
-      }
-    },
-    {
-      "path": "pages/profile/shop/editAddress",
-      "name": "editAddress",
-      "style": {
-        "navigationBarTitleText": "编辑收货地址"
-      }
-    },
-    {
-      "path": "pages/profile/shop/exchangeSuccess",
-      "name": "exchangeSuccess",
-      "style": {
-        "navigationBarTitleText": "兑换成功",
-        "navigationBarBackgroundColor": "#FFFFFF"
-      }
-    },
-    {
-      "path": "pages/profile/shop/orderList",
-      "name": "orderList",
-      "style": {
-        "navigationBarTitleText": "兑换记录",
-        "enablePullDownRefresh": true
-      }
-    },
-    {
-      "path": "pages/profile/shop/orderDetail",
-      "name": "orderDetail",
-      "style": {
-        "navigationBarTitleText": "兑换详情"
-      }
-    },
-    {
-      "path": "pages/profile/certificate/index",
-      "name": "certificate",
-      "style": {
-        "navigationBarTitleText": "我的证书",
-        "enablePullDownRefresh": true
-      }
-    },
-    {
-      "path": "pages/profile/case/detail",
-      "name": "caseDetail",
-      "style": {
-        "navigationBarTitleText": "案例详情"
-      }
-    },
-    {
-      "path": "pages/profile/case/upload",
-      "name": "upload",
-      "style": {
-        "navigationBarTitleText": "上传案例"
+        "navigationBarTitleText": "我的"
       }
     }
-  ],
 
-  "subPackages": [
-    //分包页面配置
-    {
-      "root": "packages/learn",
-      "pages": [{
-        "path": "index",
-        "style": {}
-      }]
-    },
-    {
-      "root": "packages/profile",
-      "pages": [{
-        "path": "case/details",
-        "name": "case-details",
-        "style": {
-          "navigationBarTitleText": "案例详情"
-        }
-      }]
-    }
   ],
   "preloadRule": {
     //分包预载配置
-    "pages/learn/index": {
-      "packages": [
-        "__APP__"
-      ],
-      "network": "all"
-    }
+    // "pages/learn/index": {
+    //   "packages": [
+    //     "__APP__"
+    //   ],
+    //   "network": "all"
+    // }
   },
   "easycom": {
-    "zj-(.*)": "@/components/zj/$1/$1.vue",
+    "zj-(.*)": "@/components/zj-container/zj-$1.vue",
     "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
   },
   "globalStyle": {
@@ -352,28 +76,28 @@
     "borderStyle": "black",
     "backgroundColor": "#ffffff",
     "list": [{
-        "pagePath": "pages/learn/index",
+        "pagePath": "pages/index/index",
         "iconPath": "static/tabBar/icon_learn01.png",
         "selectedIconPath": "static/tabBar/icon_learn02.png",
-        "text": "学习中心"
+        "text": "首页"
       },
       {
-        "pagePath": "pages/wiki/index",
+        "pagePath": "pages/issue/index",
         "iconPath": "static/tabBar/icon_wiki01.png",
         "selectedIconPath": "static/tabBar/icon_wiki02.png",
-        "text": "百科知识"
+        "text": "发布"
       },
       {
-        "pagePath": "pages/exam/index",
+        "pagePath": "pages/message/index",
         "iconPath": "static/tabBar/icon_exam01.png",
         "selectedIconPath": "static/tabBar/icon_exam02.png",
-        "text": "考试中心"
+        "text": "消息"
       },
       {
-        "pagePath": "pages/profile/index",
+        "pagePath": "pages/mine/index",
         "iconPath": "static/tabBar/icon_profile01.png",
         "selectedIconPath": "static/tabBar/icon_profile02.png",
-        "text": "我的主页"
+        "text": "我的"
       }
     ]
   }

src/pages/exam/index.vue

@@ -1,16 +0,0 @@
-<!-- 考试中心 -->
-<template>
-    <div>
-
-    </div>
-</template>
-
-<script>
-export default {
-
-}
-</script>
-
-<style lang="scss" scoped>
-
-</style>

src/pages/index/index.vue

@@ -0,0 +1,69 @@
+<template>
+  <zj-page-layout
+  	:hasFooter="false"
+  	:isScroll="true"
+		:refresherTriggered="refresherTriggered"
+		@refresherrefresh="refresherrefresh"
+		@scrolltolower="scrolltolower">
+    <view>首页</view>
+  </zj-page-layout>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        imgUrl: this.$imageUrl,
+        dataList: [],
+        pageNum: 1,
+        refresherTriggered: false,
+      }
+    },
+
+    async onLoad() {
+      // await this.getList()
+    },
+
+    methods: {
+      //获取列表数据
+      async getList() {
+        this.$api.post('/xxx/xxxlist', {
+          pageNum: this.pageNum,
+          pageSize: 10,
+        }).then(res => {
+          this.loadStatus = 0;
+          let list = res.data.records;
+          if(list.length < 10){
+          	this.loadStatus = 2;
+          }
+          this.dataList = this.dataList.concat(list);
+        }).catch(() => {
+					this.loadStatus = 2;
+				}).finally(res => {
+					this.refresherTriggered = false;
+				})
+      },
+      
+      // 滚动到底部
+      scrolltolower(e) {
+      	if (this.loadStatus === 0) {
+      		this.pageNum++;
+      		this.getList();
+      	}
+      },
+      
+      // 触发下拉刷新
+      refresherrefresh(e) {
+      	this.refresherTriggered = true;
+      	this.dataList = [];
+      	this.pageNum = 1;
+      	this.getList();
+      },
+
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+
+</style>

src/packages/wiki/index.vue → src/pages/issue/index.vue

@@ -1,8 +1,7 @@
-<!-- 百科知识 -->
 <template>
-    <div>
+    <view>
 
-    </div>
+    </view>
 </template>
 
 <script>
@@ -13,4 +12,4 @@ export default {
 
 <style lang="scss" scoped>
 
-</style>
+</style>

src/pages/learn/components/answerAnalysis.vue

@@ -1,308 +0,0 @@
-<template>
-  <view class="">
-    <view class="top">
-      <view class="top_left">
-        考生：{{$store.getters.username}}({{$store.getters.usercode}})
-      </view>
-      <view class="top_right">
-        考生须知
-      </view>
-    </view>
-    <!--  -->
-    <view class="content">
-      <view class="list" v-for="(v,i) in analysisTitles" :key="i">
-        <view class="list_title">
-          <view class="list_title_left">
-            ({{v.titleType===0?'单选题':v.titleType===1?'多选题':'判断题'}}){{i+1}}. {{v.titleName}}({{v.score}}分)
-          </view>
-          <!-- <view class="list_title_right">
-            （3分）
-          </view> -->
-
-        </view>
-        <!-- 单选题 -->
-        <view v-if="v.titleType===0" class="">
-          <u-radio-group v-model="v.answer" disabled style='flex-wrap: wrap;'>
-            <u-radio :customStyle=" {marginBottom: '8px',width: '50%' }" v-for="(value,index) in v.options" :key="index"
-              :name="value.sequence" :label="value.sequence+'：'+value.option">
-            </u-radio>
-          </u-radio-group>
-        </view>
-        <!-- 多选题 -->
-        <view v-if="v.titleType===1" class="">
-          <u-checkbox-group v-model="v.answer" disabled style='flex-wrap: wrap;'>
-            <u-checkbox :customStyle="{marginBottom: '8px',width: '50%'}" v-for="(value,index) in v.options"
-              :key="index" :name="value.sequence" :label="value.sequence+'：'+value.option">
-            </u-checkbox>
-          </u-checkbox-group>
-        </view>
-        <!-- 判断提 -->
-        <view v-if="v.titleType===2" class="">
-          <u-radio-group v-model="v.answer" disabled style='flex-wrap: wrap;'>
-            <u-radio :customStyle=" {marginBottom: '8px',width: '50%' }" v-for="(value,index) in v.options" :key="index"
-              :name="value.sequence" :label="value.sequence+'：'+value.option">
-            </u-radio>
-          </u-radio-group>
-        </view>
-        <view class="">
-          <text class="textCorrect">标准答案：{{v.normAnswer}}</text>
-          <text class="textError">你的答案：{{v.answer.toString()}}</text>
-        </view>
-        <view class="analysis">
-          答案解析：
-          <u-parse class='analysis_c' :content="v.analysis"></u-parse>
-
-        </view>
-
-      </view>
-    </view>
-    <u-button @click='answersFn' style='width: 700rpx;position: fixed;right: 25rpx;bottom: 20rpx;' type='primary'
-      text="答题情况">
-    </u-button>
-    <!-- 答题情况 -->
-    <u-popup :show="show" :round="10" mode="bottom" @close="close" @open="open">
-      <view class="answers">
-        <view class="">
-          <u-cell-group>
-            <u-cell title="试题列表">
-              <text @click="close" slot="value">X</text>
-            </u-cell>
-          </u-cell-group>
-        </view>
-        <view class="list">
-          <view :class=" v.answer ? 'ball' :'ball_no'" v-for="(v,i) in analysisTitles" :key="i">
-            {{i+1}}
-          </view>
-        </view>
-        <u-divider :text="`本券共${analysisTitles.length}题`"></u-divider>
-        <view class="all">
-          <view class="all_ball">
-            {{analysisTitles.length-unanswered}}
-          </view>
-          <view class="all_ok">
-            已答
-          </view>
-          <view class="all_ball_no">
-            {{unanswered}}
-          </view>
-          <view class="all_no">
-            未答
-          </view>
-        </view>
-        <!-- <view style="margin-top: 40rpx;">
-          <u-button @click='submitFn' shape='circle' style='width: 700rpx' type='primary' text="提交考试"></u-button>
-        </view> -->
-      </view>
-    </u-popup>
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        unanswered: '',
-        analysisTitles: [],
-        dataList: {},
-        show: false,
-        checkboxValue1: [],
-        checkboxList1: [{
-            name: '苹果',
-            disabled: false
-          },
-          {
-            name: '香蕉',
-            disabled: false
-          },
-          {
-            name: '橙子',
-            disabled: false
-          },
-          {
-            name: '11',
-            disabled: false
-          }
-        ],
-      }
-    },
-    onLoad(options) {
-      this.getData(options)
-    },
-    methods: {
-      //获取数据
-      async getData(options) {
-        let res = {}
-        let params = {
-          testRecordSheetId: options.testRecordSheetId
-        }
-        if (options.projectDisciplineId !== '') {
-          res = await this.$api.post('/personal/project-vouchers-content', params)
-        } else {
-          res = await this.$api.post('/personal/vouchers-content', params)
-        }
-
-        let unanswered = 0
-        res.data.analysisTitles.forEach((item, index) => {
-          item.analysis = item.analysis.replace(/<([/]?)(p)((:?s*)(:?[^>]*)(:?s*))>/g, '<$1div$3>');
-          let answer = item.submitAnswer.slice(item.submitAnswer.indexOf('：') + 1, item.submitAnswer.length);
-          if (!answer) {
-            unanswered++
-          }
-          if (item.titleType == 1) {
-            res.data.analysisTitles[index].answer = answer.split('');
-          } else {
-            res.data.analysisTitles[index].answer = answer;
-          }
-        });
-        this.unanswered = unanswered
-        this.dataList = res.data
-        this.analysisTitles = res.data.analysisTitles
-      },
-      //答题情况
-      answersFn() {
-        this.show = true
-      },
-      open() {
-        // console.log('open');
-      },
-      close() {
-        this.show = false
-        // console.log('close');
-      },
-    }
-  }
-</script>
-
-<style scoped lang="scss">
-  .top {
-    display: flex;
-    justify-content: space-around;
-    align-items: center;
-    height: 120rpx;
-    background-color: #6DA7FF;
-    color: #fff;
-
-    .top_left {
-      font-size: 28rpx;
-    }
-
-    .top_right {
-      font-size: 24rpx;
-
-    }
-  }
-
-  .content {
-    padding: 20rpx 20rpx 160rpx 20rpx;
-  }
-
-  .list {
-    margin-bottom: 20rpx;
-
-    .list_title {
-      display: flex;
-      font-size: 28rpx;
-      margin-bottom: 10rpx;
-
-      .list_title_left {
-        flex: 1;
-      }
-
-      .list_title_right {
-        width: 150rpx;
-      }
-
-    }
-  }
-
-  .textCorrect {
-    font-size: 28rpx;
-    color: #4cc42c;
-  }
-
-  .textError {
-    padding-left: 30rpx;
-    color: #fb015b;
-    font-size: 28rpx;
-  }
-
-  .answers {
-    .list {
-      display: flex;
-      flex-wrap: wrap;
-    }
-
-    .ball {
-      margin: 20rpx 54rpx;
-      width: 40rpx;
-      height: 40rpx;
-      line-height: 40rpx;
-      text-align: center;
-      color: #fff;
-      font-size: 28rpx;
-      background: #00b226;
-      border-radius: 40rpx;
-    }
-
-    .ball_no {
-      margin: 20rpx 54rpx;
-      width: 40rpx;
-      height: 40rpx;
-      line-height: 40rpx;
-      text-align: center;
-      color: #fff;
-      font-size: 28rpx;
-      background: #FF8519;
-      border-radius: 40rpx;
-    }
-
-    .all {
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      margin-bottom: 40rpx;
-
-      .all_ball {
-        width: 40rpx;
-        height: 40rpx;
-        line-height: 40rpx;
-        text-align: center;
-        color: #fff;
-        font-size: 28rpx;
-        background: #00b226;
-        border-radius: 40rpx;
-      }
-
-      .all_ball_no {
-        width: 40rpx;
-        height: 40rpx;
-        line-height: 40rpx;
-        text-align: center;
-        color: #fff;
-        font-size: 28rpx;
-        background: #FF8519;
-        border-radius: 40rpx;
-      }
-
-      .all_ok {
-        padding: 0 30rpx;
-      }
-
-      .all_no {
-        padding: 0 30rpx;
-      }
-    }
-  }
-
-  .analysis {
-    margin-top: 10px;
-    color: #666666;
-    font-size: 24rpx;
-    // padding-left: 60px;
-    display: flex;
-
-    .analysis_c {
-      flex: 1;
-    }
-  }
-</style>

src/pages/learn/components/exam.vue

@@ -1,401 +0,0 @@
-<template>
-  <view class="page">
-    <!-- <view class="aaa" style=""> -->
-    <u-sticky>
-      <view class="top">
-        <view class="top_left">
-          考生： {{$store.getters.username}}({{$store.getters.usercode}})
-        </view>
-        <view class="top_right">
-          考生须知
-        </view>
-      </view>
-    </u-sticky>
-
-    <view class="content">
-      <view class="list" v-for="(v,i) in dataList.titleInfos" :key="i">
-        <view class="list_title">
-          <view class="list_title_left">
-            ({{v.titleType===0? '单选题':v.titleType===1?'多选题':'判断题'}}) {{i+1}}.{{v.titleName}}({{v.score}}分)
-          </view>
-          <!--  <view class="list_title_right">
-            （3分）
-          </view> -->
-        </view>
-        <!-- 单选题 -->
-        <view v-if="v.titleType===0" class="">
-          <u-radio-group v-model="v.answer" style='flex-wrap: wrap;'>
-            <u-radio :customStyle=" {marginBottom: '8px',width: '50%' }" v-for="(value,i) in v.options" :key="i"
-              :name="value.sequence" :label="value.sequence+'：'+value.option">
-            </u-radio>
-          </u-radio-group>
-        </view>
-        <!-- 多选题 -->
-        <view v-if="v.titleType===1" class="">
-          <u-checkbox-group v-model="v.answer" style='flex-wrap: wrap;'>
-            <u-checkbox :customStyle="{marginBottom: '8px',width: '50%'}" v-for="(value,i) in v.options" :key="i"
-              :name="value.sequence" :label="value.sequence+'：'+value.option">
-            </u-checkbox>
-          </u-checkbox-group>
-        </view>
-        <!-- 判断提 -->
-        <view v-if="v.titleType ===  2" class="">
-          <u-radio-group v-model="v.answer" style='flex-wrap: wrap;'>
-            <u-radio :customStyle=" {marginBottom: '8px',width: '50%' }" v-for="(value,i) in v.options" :key="i"
-              :name="value.sequence" :label="value.sequence+'：'+value.option">
-            </u-radio>
-          </u-radio-group>
-
-        </view>
-
-
-      </view>
-    </view>
-    <u-button @click='answersFn' style='width: 160rpx;position: fixed;left: 20rpx;bottom: 20rpx;' type='primary'
-      text="答题情况"></u-button>
-    <u-button @click='submitFn' style='width: 500rpx;position: fixed;right: 20rpx;bottom: 20rpx;' type='primary'
-      text="提交">
-    </u-button>
-    <!-- 答题情况 -->
-    <u-popup :show="show" :round="10" mode="bottom" @close="close" @open="open">
-      <view class="answers">
-        <view class="">
-          <u-cell-group>
-            <u-cell title="试题列表">
-              <text @click="close" slot="value">X</text>
-            </u-cell>
-          </u-cell-group>
-        </view>
-        <view class="list">
-          <view :class="v.answer=='' || v.answer == [] ? 'ball_no' : 'ball'" v-for="(v,i) in dataList.titleInfos"
-            :key="i">
-            {{i+1}}
-          </view>
-        </view>
-        <u-divider :text="`本券共${titleInfos.length}题`"></u-divider>
-        <view class="all">
-          <view class="all_ball">
-            {{titleInfos.length-unanswered}}
-          </view>
-          <view class="all_ok">
-            已答
-          </view>
-          <view class="all_ball_no">
-            {{titleInfos.length}}
-          </view>
-          <view class="all_no">
-            未答
-          </view>
-        </view>
-        <!-- <view style="margin-top: 40rpx;">
-          <u-button @click='submitFn' shape='circle' style='width: 700rpx' type='primary' text="提交考试"></u-button>
-        </view> -->
-      </view>
-    </u-popup>
-    <!-- 模态框 -->
-    <u-modal @confirm='confirmFn' @cancel='cancelFn' :show="showModal" :title="title" :content='content'
-      showCancelButton></u-modal>
-    <!-- 遮罩层 -->
-    <u-overlay :show="showOverlay" :opacity='1' style='background-color: #c1c1c1;'>
-      <view class="warp">
-        <u-modal @confirm='confirmOverlayFn' @cancel='cancelOverlayFn' :show="showModalOverlay" title="考生须知"
-          showCancelButton>
-          <view class="slot-content">
-            <rich-text :nodes="contentSlot"></rich-text>
-          </view>
-        </u-modal>
-      </view>
-    </u-overlay>
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        options: {},
-        dataList: {},
-        titleInfos: [],
-        showOverlay: false,
-        showModalOverlay: false,
-        showModal: false,
-        title: '提示',
-        content: '请确认作答全部完成再提交，提交后将不可 修改作答结果！',
-        contentSlot: `
-        <div style="font-size: 12px; color: #666666">
-            <p>考生须诚信考试，端正考试态度，实事求是</p>
-            <p>一、考试环境要求</p>
-            <p>&emsp;1.PC端要求：谷歌浏览器（建议使用6.0版本以上）、IE9以上浏览器、火狐浏览器50版本以上。</p>
-            <p>&emsp;2.移动端要求：登录嘉讯茂-学习平台进行考试，请勿在移动设备使用浏览器登录考试。</p>
-            <p>二、考生答题要求</p>
-            <p>&emsp;1.如果当前考试设置了切屏，当达到本次考试设置的切屏次数时，系统将自动交卷。</p>
-            <p>&emsp;2.考试过程中如意外退出考试系统（如死机、断电等情况），系统不会自动交卷，考生需尽快再次登录系统进入考试，之前的答卷信息会保留。如在考试倒计时截止前进入考试，可继续答题；考试倒计时截止后进入，系统将提示交卷，不可继续答题。</p>
-            <p>&emsp;3.考试过程中，可在答题卡中快速查看已答题目、未答题目和待检查的题目。</p>
-            <p>&emsp;4.考生在使用移动设备答题时，需要注意右下角答题数量，如果在已经答题的情况下，已答题数依然显示为0，则需要马上更换设备进行作答。</p>
-            <p>&emsp;5. 答题完毕后，一定要点击交卷按钮进行交卷，请勿直接关闭浏览器。</p>
-            <p>三、其他</p>
-            <p>&emsp;1.如果当前考试允许多次考试，最终成绩取最高分。</p>
-            <p>&emsp;2.交卷后，考生在考试记录中查看考试得分和答卷详情。</p>
-            <p>&emsp;3.考试过程中如遇特殊情况，可与考试组织方联系。</p>
-        </div>`,
-        show: false,
-        value: null,
-        checkboxValue1: [],
-        checkboxList1: [{
-            name: '苹果',
-            disabled: false
-          },
-          {
-            name: '香蕉',
-            disabled: false
-          },
-          {
-            name: '橙子',
-            disabled: false
-          },
-          {
-            name: '11',
-            disabled: false
-          }
-        ],
-      };
-    },
-    computed: {
-
-      unanswered() {
-        let num = 0
-        this.titleInfos.forEach(v => {
-          if (v.answer === '' || v.answer === []) {
-            num = num + 1
-          }
-        })
-        return num
-      }
-    },
-    onLoad(options) {
-      this.showOverlay = true
-      this.showModalOverlay = true
-      this.options = options
-
-    },
-    onShow() {
-      this.getData(this.options)
-    },
-    methods: {
-      //提交
-      async submit() {
-        let dataList = JSON.parse(JSON.stringify(this.dataList)).titleInfos;
-        // 遍历试题
-        for (let i = 0; i < dataList.length; i++) {
-          // 遍历选项
-          for (let j = 0; j < dataList[i].options.length; j++) {
-            if (dataList[i].answer.indexOf(dataList[i].options[j].sequence) > -1) {
-              dataList[i].options[j].answer = true;
-            }
-          }
-        }
-        let params = {
-
-          "disciplineId": this.options.disciplineId,
-          "projectDisciplineFlag": this.options.projectDisciplineId ? true : false,
-          "projectDisciplineId": this.options.projectDisciplineId ? this.options.projectDisciplineId : '',
-          "titles": dataList
-        }
-        await this.$api.post('/homepage/confirm', params)
-        uni.navigateBack({
-          delta: 1
-        });
-
-      },
-
-      //获取数据
-      async getData(options) {
-
-        let params = {
-          "accountCode": this.$store.getters.usercode,
-          "disciplineId": options.disciplineId,
-          "projectDisciplineFlag": options.projectDisciplineId === '' ? false : true,
-          "projectDisciplineId": options.projectDisciplineId === '' ? '' : options.projectDisciplineId,
-        }
-        let {
-          data
-        } = await this.$api.post('/homepage/gettitle', params)
-        data.titleInfos.forEach((v, i) => {
-          if (v.titleType === 1) {
-            v.answer = []
-          } else {
-            v.answer = ''
-          }
-
-        })
-        this.dataList = data
-        this.titleInfos = data.titleInfos
-
-      },
-      // 遮罩层模态框确认
-      confirmOverlayFn() {
-        this.showOverlay = false
-        this.showModalOverlay = false
-
-      },
-      // 遮罩层模态框取消
-      cancelOverlayFn() {
-        this.$router.go(-1)
-      },
-      // 模态框确认
-      confirmFn() {
-        this.submit()
-        this.cancelFn()
-
-      },
-      // 模态框取消
-      cancelFn() {
-        this.showModal = false
-      },
-      // 提交考试
-      submitFn() {
-        this.showModal = true
-      },
-      open() {
-        // console.log('open');
-      },
-      close() {
-        this.show = false
-        // console.log('close');
-      },
-      answersFn() {
-        this.show = true
-      }
-    }
-  }
-</script>
-
-<style scoped lang="scss">
-  page {
-    background-color: #fff;
-  }
-
-  .warp {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 100%;
-  }
-
-  .answers {
-    .list {
-      display: flex;
-      flex-wrap: wrap;
-      // margin-bottom: 20rpx;
-    }
-
-    .ball {
-      margin: 20rpx 54rpx;
-      width: 40rpx;
-      height: 40rpx;
-      line-height: 40rpx;
-      text-align: center;
-      color: #fff;
-      font-size: 28rpx;
-      background: #00b226;
-      border-radius: 40rpx;
-    }
-
-    .ball_no {
-      margin: 20rpx 54rpx;
-      width: 40rpx;
-      height: 40rpx;
-      line-height: 40rpx;
-      text-align: center;
-      color: #fff;
-      font-size: 28rpx;
-      background: #FF8519;
-      border-radius: 40rpx;
-    }
-
-    .all {
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      margin-bottom: 40rpx;
-
-      .all_ball {
-        width: 40rpx;
-        height: 40rpx;
-        line-height: 40rpx;
-        text-align: center;
-        color: #fff;
-        font-size: 28rpx;
-        background: #00b226;
-        border-radius: 40rpx;
-      }
-
-      .all_ball_no {
-        width: 40rpx;
-        height: 40rpx;
-        line-height: 40rpx;
-        text-align: center;
-        color: #fff;
-        font-size: 28rpx;
-        background: #FF8519;
-        border-radius: 40rpx;
-      }
-
-      .all_ok {
-        padding: 0 30rpx;
-      }
-
-      .all_no {
-        padding: 0 30rpx;
-      }
-    }
-  }
-
-  .page {
-    // height: 93vh;
-    // position: relative;
-    padding-bottom: 76rpx;
-  }
-
-  .content {
-    padding: 20rpx;
-  }
-
-  .top {
-    display: flex;
-    justify-content: space-around;
-    align-items: center;
-    height: 120rpx;
-    background-color: #6DA7FF;
-    color: #fff;
-
-    .top_left {
-      font-size: 28rpx;
-    }
-
-    .top_right {
-      font-size: 24rpx;
-
-    }
-  }
-
-  .list {
-    margin-bottom: 20rpx;
-
-    .list_title {
-      display: flex;
-      font-size: 28rpx;
-      margin-bottom: 20rpx;
-
-      .list_title_left {
-        line-height: 40rpx;
-        flex: 1;
-      }
-
-      .list_title_right {
-        width: 150rpx;
-      }
-
-    }
-  }
-</style>

src/pages/learn/components/examDetail.vue

@@ -1,149 +0,0 @@
-<template>
-  <view class="">
-    <view style="height: 350rpx;" class="">
-      <image style='width: 100%;height: 100%;' :src="$imageUrl+dataList.imageUrl" mode="aspectFill"></image>
-    </view>
-    <!--  -->
-
-    <view class="content">
-      考试内容
-    </view>
-    <view class="exam">
-      <text class="exam_title">{{dataList.certificateName}}</text>
-      <view class="exam_content">
-        <text>时长: {{dataList.timeLength}}分钟</text>
-        <text>完成规则： 合格</text>
-        <text>允许次数： 无限制</text>
-        <text>已考次数： {{dataList.amount}}</text>
-        <text>组卷方式： {{dataList.questionsType === 0 ? '指定考题' : '随机抽取'}}</text>
-        <text>题量： {{dataList.questionsNumber}}</text>
-        <text>状态：
-          <text v-if="dataList.resultsFlag" style="color: #4bc753;display: inline;">已通过</text>
-          <text v-else style="color: #ff0000;display: inline;">未通过</text>
-
-        </text>
-        <text>答案查看规则： 试卷合格后显示得分与标准答案</text>
-      </view>
-      <view style="float: right;display: flex">
-        <u-button v-if="dataList.amount !== 0 " @click='retestFn' style='width: 160rpx;margin-right: 20rpx'
-          shape="circle" type="primary" size='mini' text="重新考试">
-        </u-button>
-        <u-button v-if="dataList.amount !== 0 " @click='examRecordFn' style='width: 160rpx;' shape="circle"
-          type="primary" size='mini' text="考试记录">
-        </u-button>
-      </view>
-      <br>
-      <br>
-      <view class="">
-        <view style="padding: 20rpx 0;">考前须知</view>
-        <rich-text :nodes="contentSlot"></rich-text>
-      </view>
-    </view>
-
-
-
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        options: {},
-        dataList: {},
-        contentSlot: `
-        <div style="font-size: 12px;line-height: 24px;padding-bottom: 20px; color: #666666">
-            <p>考生须诚信考试，端正考试态度，实事求是</p>
-            <p>一、考试环境要求</p>
-            <p>&emsp;1.PC端要求：谷歌浏览器（建议使用6.0版本以上）、IE9以上浏览器、火狐浏览器50版本以上。</p>
-            <p>&emsp;2.移动端要求：登录嘉讯茂-学习平台进行考试，请勿在移动设备使用浏览器登录考试。</p>
-            <p>二、考生答题要求</p>
-            <p>&emsp;1.如果当前考试设置了切屏，当达到本次考试设置的切屏次数时，系统将自动交卷。</p>
-            <p>&emsp;2.考试过程中如意外退出考试系统（如死机、断电等情况），系统不会自动交卷，考生需尽快再次登录系统进入考试，之前的答卷信息会保留。如在考试倒计时截止前进入考试，可继续答题；考试倒计时截止后进入，系统将提示交卷，不可继续答题。</p>
-            <p>&emsp;3.考试过程中，可在答题卡中快速查看已答题目、未答题目和待检查的题目。</p>
-            <p>&emsp;4.考生在使用移动设备答题时，需要注意右下角答题数量，如果在已经答题的情况下，已答题数依然显示为0，则需要马上更换设备进行作答。</p>
-            <p>&emsp;5. 答题完毕后，一定要点击交卷按钮进行交卷，请勿直接关闭浏览器。</p>
-            <p>三、其他</p>
-            <p>&emsp;1.如果当前考试允许多次考试，最终成绩取最高分。</p>
-            <p>&emsp;2.交卷后，考生在考试记录中查看考试得分和答卷详情。</p>
-            <p>&emsp;3.考试过程中如遇特殊情况，可与考试组织方联系。</p>
-        </div>`,
-      }
-    },
-    onLoad(options) {
-      this.options = options
-      this.getData(options)
-    },
-    methods: {
-      //获取数据
-      async getData(options) {
-        if (options.projectDisciplineId !== '') {
-          let params = {
-            "accountCode": this.$store.getters.usercode,
-            "disciplineId": options.disciplineId,
-            "projectDisciplineId": options.projectDisciplineId,
-          }
-          let {
-            data
-          } = await this.$api.post('/personal/project-test-detail', params)
-          this.dataList = data
-        } else {
-          let params = {
-            "accountCode": this.$store.getters.usercode,
-            "disciplineId": options.disciplineId,
-          }
-          let {
-            data
-          } = await this.$api.post('/personal/test-detail', params)
-          this.dataList = data
-        }
-
-      },
-      //重新考试
-      retestFn() {
-        uni.navigateTo({
-          url: `pages/learn/components/exam?disciplineId=${this.options.disciplineId}&projectDisciplineId=${this.options.projectDisciplineId}`,
-        })
-      },
-      //考试记录
-      examRecordFn() {
-        uni.navigateTo({
-          url: `pages/learn/components/examRecord?disciplineId=${this.options.disciplineId}&projectDisciplineId=${this.options.projectDisciplineId}`,
-        })
-      }
-    }
-  }
-</script>
-
-<style scoped lang="scss">
-  .content {
-    margin: 24rpx 0;
-    padding-left: 24rpx;
-    font-size: 28rpx;
-    background-color: #EFEFEF;
-    height: 88rpx;
-    line-height: 88rpx;
-  }
-
-  .exam {
-    font-size: 28rpx;
-    padding: 0 24rpx;
-
-
-    .exam_title {
-      color: #333333;
-
-    }
-
-    .exam_content {
-      padding: 20rpx 0;
-
-      text {
-        display: block;
-        color: #666666;
-        padding: 10rpx 0;
-      }
-    }
-
-  }
-</style>

src/pages/learn/components/examRecord.vue

@@ -1,104 +0,0 @@
-<template>
-  <view class="content">
-    <view @click="toAnalysisFn(v.testRecordSheetId)" class="record" v-for="(v,i) in dataList" :key="i">
-      <view class="record_left">
-        <view>考试次数：第{{v.sequence}}次 </view>
-        <view>考试时间：{{v.createTime}}</view>
-      </view>
-      <view class="">
-        <image v-if="v.resultsFlag" src="@/static/icon_ok.png" style="width: 80rpx;height: 80rpx;">
-        </image>
-        <image v-else src="@/static/icon_pass.png" style="width: 80rpx;height: 80rpx;">
-        </image>
-      </view>
-    </view>
-
-
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        pageNum: 1,
-        dataList: [],
-        options: {}
-      }
-    },
-    onLoad(options) {
-      this.options = options
-      this.getData(options)
-    },
-    async onPullDownRefresh() {
-
-      this.pageNum = 1
-      let res = await this.getData(this.options)
-      this.dataList = res
-      uni.stopPullDownRefresh()
-    },
-    async onReachBottom() {
-
-      this.pageNum++
-      await this.getData(this.options)
-    },
-    methods: {
-      //获取列表数据
-      async getData(options) {
-        let res = {}
-        if (options.projectDisciplineId !== '') {
-          let params = {
-            "accountCode": this.$store.getters.usercode,
-            "disciplineId": options.disciplineId,
-            "pageNum": this.pageNum,
-            "pageSize": 10,
-            "projectDisciplineId": options.projectDisciplineId
-          }
-          res = await this.$api.post('/personal/project-test-record', params)
-          this.dataList = [...this.dataList, ...res.data.records]
-          // return data.records
-        } else {
-          let params = {
-            "accountCode": this.$store.getters.usercode,
-            "disciplineId": options.disciplineId,
-            "pageNum": this.pageNum,
-            "pageSize": 10
-          }
-          res = await this.$api.post('/personal/test-record', params)
-          this.dataList = [...this.dataList, ...res.data.records]
-          // return data.records
-        }
-
-
-        return res.data.records
-      },
-      // 跳转答案解析页面
-      toAnalysisFn(testRecordSheetId) {
-        uni.navigateTo({
-          url: `pages/learn/components/answerAnalysis?testRecordSheetId=${testRecordSheetId}&projectDisciplineId=${this.options.projectDisciplineId}`,
-        })
-      }
-    }
-  }
-</script>
-
-<style scoped lang="scss">
-  .content {
-    padding: 0 30rpx;
-  }
-
-  .record {
-    margin: 20rpx 0;
-    height: 120rpx;
-    background-color: #fff;
-    border-radius: 20rpx;
-    display: flex;
-    justify-content: space-around;
-    align-items: center;
-
-    .record_left {
-      font-size: 28rpx;
-      line-height: 50rpx;
-    }
-  }
-</style>

src/pages/learn/components/learnDetail.vue

@@ -1,417 +0,0 @@
-<template>
-  <view class="">
-    <view class="header">
-      <image style='width: 100%;height: 100%;' :src="$imageUrl+detailData.imageUrl" mode="aspectFill"></image>
-    </view>
-    <view class="describe">
-      <view class="describe_title">
-        {{detailData.disciplineName}}
-      </view>
-      <view class="describe_content">
-        {{detailData.disciplineOverview}}
-      </view>
-      <view class="describe_bottom">
-        <u-row>
-          <u-col span="12">
-            难度系数：{{detailData.difficultyCoefficient === 0 ?'简单':detailData.difficultyCoefficient === 1 ?'容易':'较难'}}
-          </u-col>
-        </u-row>
-        <u-row>
-          <u-col span="12">
-            品牌：{{detailData.brandName}}
-          </u-col>
-        </u-row>
-        <u-row>
-          <u-col span="9">
-            课程总时长：{{detailData.timeLength}}分钟
-          </u-col>
-          <u-col span="3">
-            <view @click="isCollection" class="" style="float: right;">
-              <img v-show='detailData.collection' src="@/static/icon_like.png"
-                style='width: 32rpx;height: 32rpx;vertical-align: bottom;' alt="">
-              <img v-show="!detailData.collection" src="@/static/icon_unlike.png"
-                style='width: 32rpx;height: 32rpx;vertical-align: bottom;' alt="">
-              <text style="padding-left: 10rpx;"> 收藏</text>
-            </view>
-          </u-col>
-        </u-row>
-      </view>
-    </view>
-    <!-- 专题学习 -->
-    <!-- <view class="">
-      <view class="title">
-        专题内容
-      </view>
-      <view class="">
-        <u-collapse accordion>
-          <u-collapse-item title="专题一">
-            <view class="list">
-              <view class="list_top">
-                <view class="left">
-                  <view class="left_title">
-                    我我我我我我我owowo我我我我我我我我我我我我我我我我我我我我我
-                  </view>
-                  <view class="left_time">
-                    课程时长
-                  </view>
-                </view>
-                <view class="right">
-                  已完成
-                </view>
-              </view>
-              <view class="list_bottom">
-                <u-button style='width: 160rpx;display:inline-block;' type="primary" shape="circle" size='mini'
-                  text="重新学习">
-                </u-button>
-                <u-button style='width: 160rpx;display: inline-block;' shape="circle" type="primary" size='mini'
-                  text="查看考试"></u-button>
-                <u-button style='width: 160rpx;display: inline-block;' shape="circle" type="primary" size='mini'
-                  text="继续学习"></u-button>
-                <u-button style='width: 160rpx;display: inline-block;' shape="circle" type="primary" size='mini'
-                  text="开始考试"></u-button>
-              </view>
-            </view>
-          </u-collapse-item>
-          <u-collapse-item title="专题二">
-            <view class="list">
-              <view class="list_top">
-                <view class="left">
-                  <view class="left_title">
-                    我我我我我我我owowo我我我我我我我我我我我我我我我我我我我我我
-                  </view>
-                  <view class="left_time">
-                    课程时长
-                  </view>
-                </view>
-                <view class="right">
-                  已完成
-                </view>
-              </view>
-              <view class="list_bottom">
-                <u-button style='width: 160rpx;display:inline-block;' type="primary" shape="circle" size='mini'
-                  text="重新学习">
-                </u-button>
-                <u-button style='width: 160rpx;display: inline-block;' shape="circle" type="primary" size='mini'
-                  text="查看考试"></u-button>
-                <u-button style='width: 160rpx;display: inline-block;' shape="circle" type="primary" size='mini'
-                  text="继续学习"></u-button>
-                <u-button style='width: 160rpx;display: inline-block;' shape="circle" type="primary" size='mini'
-                  text="开始考试"></u-button>
-              </view>
-            </view>
-          </u-collapse-item>
-        </u-collapse>
-        <view class="download">
-          <view class="download_title">
-            附件下载
-          </view>
-          <view class="download_file">
-            <u-row customStyle="margin-bottom: 10px">
-              <u-col span="10">
-                <view class="download_file_text">
-                  撒靠akdsjj
-                </view>
-              </u-col>
-              <u-col span="2">
-                <u-button style='width: 20rpx' icon='download' type="primary" size='mini'></u-button>
-              </u-col>
-            </u-row>
-
-          </view>
-        </view>
-      </view>
-    </view> -->
-    <!-- 课程学习 -->
-    <view class="">
-      <view class="title">
-        <view class="title_left">
-          课程学习
-        </view>
-        <view class="title_right">
-          {{detailData.status === 1 ? '未开始' : detailData.status === 2 ? '学习中' : '已完成'}}
-        </view>
-      </view>
-      <view class="curriculum">
-        <view class="curriculum_content">
-          <view class="">
-            <view class="curriculum_title">
-              {{detailData.disciplineName}}
-            </view>
-            <view class="curriculum_time">
-              时长 {{detailData.timeLength}}分钟/已完成：{{detailData.haveTimeLength}}分钟
-            </view>
-          </view>
-          <view class="curriculum_bottom">
-            <u-button v-if="detailData.status !== 1 && detailData.titleFlag" @click='examDetailFn'
-              style='width: 160rpx;' shape="circle" type="primary" size='mini' text="查看考试"></u-button>
-            <u-button @click='studyFn' style='width: 160rpx;' shape="circle" type="primary" size='mini'
-              :text="detailData.status === 2?'继续学习' :detailData.status === 1?'开始学习':'重新学习' ">
-            </u-button>
-            <u-button v-if="detailData.status !== 1 && detailData.titleFlag " @click='examFn' style='width: 160rpx;'
-              shape="circle" type="primary" size='mini' text="开始考试">
-            </u-button>
-          </view>
-
-        </view>
-        <view class="download">
-          <view class="download_title">
-            附件下载
-          </view>
-          <view class="download_file">
-            <u-row customStyle="margin-bottom: 10px" v-for="v in detailData.disciplineUrl">
-              <u-col span="10">
-                <view class="download_file_text">
-                  {{v.name}}
-                </view>
-              </u-col>
-              <u-col span="2">
-                <u-button @click='downFile(v.fullUrl)' style='width: 20rpx' icon='download' type="primary" size='mini'>
-                </u-button>
-              </u-col>
-            </u-row>
-
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        detailData: {},
-      }
-    },
-    onLoad(options) {
-      this.disciplineId = options.disciplineId
-    },
-    onShow() {
-      this.getData()
-    },
-
-    methods: {
-      //是否收藏
-      async isCollection() {
-        if (this.detailData.collection) {
-          let params = {
-            collectionId: this.detailData.collectionId
-          }
-          await this.$api.post('/personal/cancle', params)
-        } else {
-          let params = {
-            "disciplineId": this.detailData.disciplineId,
-            "disciplineName": this.detailData.disciplineName,
-            "disciplineType": this.detailData.disciplineType
-          }
-          await this.$api.post('/personal/collection', params)
-        }
-        await this.getData()
-      },
-      //下载
-      downFile(fullUrl) {
-        if (this.$store.getters.downloadFlag) {
-          window.open(fullUrl)
-        } else {
-          uni.showToast({
-            title: "该账号暂无下载权限",
-            duration: 1000,
-            icon: 'none'
-          })
-        }
-
-      },
-      //获取详情数据
-      async getData() {
-        let params = {
-          // "disciplineId": this.$route.query.disciplineId,
-          "disciplineId": this.disciplineId,
-          accountCode: this.$store.getters.usercode
-        }
-        let {
-          data
-        } = await this.$api.post('/personal/detail', params)
-        this.detailData = data
-      },
-      //查看考试
-      examDetailFn() {
-        uni.navigateTo({
-          url: `pages/learn/components/examDetail?disciplineId=${this.detailData.disciplineId}&projectDisciplineId=${''}`
-        })
-      },
-      //开始考试
-      examFn() {
-        uni.navigateTo({
-          url: `pages/learn/components/exam?disciplineId=${this.detailData.disciplineId}&projectDisciplineId=${''}`
-        });
-      },
-      //学习
-      async studyFn() {
-        let params = {
-          accountCode: this.$store.getters.usercode,
-          "disciplineId": this.detailData.disciplineId,
-          "projectDisciplineFlag": false,
-          "timeLength": this.detailData.haveTimeLength
-        }
-        await this.$api.post('/homepage/detail', params)
-
-        uni.navigateTo({
-          url: `pages/learn/components/study?disciplineId=${this.detailData.disciplineId}&projectDisciplineId=${''}`
-        })
-      }
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  page {
-    background-color: #fff;
-  }
-
-  .header {
-    // width: 100%;
-    height: 350rpx;
-    // background-color: #2F9AD2;
-  }
-
-  .describe {
-    // width: 100%;
-    // height: 240rpx;
-    font-size: 28rpx;
-    font-weight: 700;
-    background-color: #fff;
-    margin: 30rpx 20rpx;
-
-    .describe_title {
-      font-size: 28rpx;
-      color: #333333;
-    }
-
-    .describe_content {
-      font-size: 24rpx;
-      color: #666666;
-      padding: 20rpx 0;
-    }
-
-    .describe_bottom {
-      font-size: 24rpx;
-      color: #666666;
-    }
-
-  }
-
-  .title {
-    // width: 100%;
-    height: 88rpx;
-    background-color: #EFEFEF;
-    line-height: 88rpx;
-    padding: 0 20rpx;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-
-    .title_left {
-      font-size: 32rpx;
-    }
-
-    .title_right {
-      font-size: 28rpx;
-      color: #E95505;
-    }
-  }
-
-  .list {
-    .list_top {
-      display: flex;
-      width: 100%;
-      // justify-content: space-between;
-
-
-      .left {
-        flex: 1;
-        padding-right: 40rpx;
-
-        .left_title {
-          font-size: 28rpx;
-          font-weight: 700;
-        }
-
-        .left_time {
-          font-size: 28rpx;
-          color: #6C6C6C;
-          padding: 12rpx 0;
-        }
-      }
-
-      .right {
-        width: 100rpx;
-      }
-    }
-
-    .list_bottom {
-      // display: flex;
-      // justify-content: flex-end
-
-      float: right;
-
-      // uni-button {
-      //   margin-left: 20rpx;
-      // }
-    }
-  }
-
-  .u-collapse-item__content {
-    height: auto;
-  }
-
-  .download {
-    padding-bottom: 20rpx;
-
-    .download_title {
-      font-size: 24rpx;
-      padding: 32rpx 0 32rpx 32rpx;
-    }
-
-    .download_file {
-      .download_file_text {
-        font-size: 24rpx;
-        color: #6DA7FF;
-        padding: 0 0 0rpx 32rpx;
-      }
-    }
-  }
-
-  .curriculum {
-
-    // padding: 32rpx;
-    .curriculum_content {
-      padding: 32rpx;
-
-      .curriculum_title {
-        font-size: 28rpx;
-        font-weight: 700;
-      }
-
-      .curriculum_time {
-        font-size: 24rpx;
-        color: #666666;
-        padding: 20rpx 0;
-
-      }
-
-      .curriculum_bottom {
-
-        display: flex;
-        float: right;
-
-        >uni-button {
-          margin-left: 20rpx;
-        }
-      }
-
-    }
-
-  }
-</style>

src/pages/learn/components/specialDetail.vue

@@ -1,279 +0,0 @@
-<template>
-  <view class="">
-    <view class="header">
-      <image style='width: 100%;height: 100%;' :src="$imageUrl+projectDiscipline.imageUrl" mode="aspectFill"></image>
-    </view>
-    <!--  -->
-    <view class="describe">
-      <view class="describe_title">
-        {{projectDiscipline.projectDisciplineName}}
-      </view>
-      <view class="describe_content">
-        {{projectDiscipline.projectDisciplineOverview}}
-      </view>
-      <view class="describe_bottom">
-        <u-row>
-          <u-col span="12">
-            难度系数：{{projectDiscipline.difficultyCoefficient === 0 ?'简单':projectDiscipline.difficultyCoefficient === 1 ?'容易':'较难'}}
-          </u-col>
-        </u-row>
-        <u-row>
-          <u-col span="12">
-            品牌：{{projectDiscipline.brandName}}
-          </u-col>
-        </u-row>
-        <u-row>
-          <u-col span="9">
-            课程总时长：{{projectDiscipline.timeLength}}分钟
-          </u-col>
-          <u-col span="3">
-            <!--  <view @click="isCollection" class="" style="float: right;">
-              <img v-show='detailData.collection' src="@/static/icon_like.png"
-                style='width: 32rpx;height: 32rpx;vertical-align: bottom;' alt="">
-              <img v-show="!detailData.collection" src="@/static/icon_unlike.png"
-                style='width: 32rpx;height: 32rpx;vertical-align: bottom;' alt="">
-              <text style="padding-left: 10rpx;"> 收藏</text>
-            </view> -->
-          </u-col>
-        </u-row>
-      </view>
-    </view>
-    <!--  -->
-    <!-- 专题学习 -->
-    <view class="">
-      <view class="title">
-        专题内容
-      </view>
-      <view class="">
-        <u-collapse accordion>
-          <u-collapse-item v-for="(v,i) in groups" :key="i" :title="v.projectGroupName">
-            <view v-for="(item,index) in v.disciplines" :key="index" class="list">
-              <view class="list_top">
-                <view class="left">
-                  <view class="left_title">
-                    {{item.disciplineName}}
-                  </view>
-                  <view class="left_time">
-                    课程时长:{{item.timeLength}}分钟/已完成:{{item.haveTimeLength}}分钟
-                  </view>
-                </view>
-                <view class="right">
-                  {{item.status==='1'?'未开始':item.status === '2'?'学习中':'已完成'}}
-                </view>
-              </view>
-              <view class="list_bottom">
-
-                <u-button v-if="item.status !== '1' && item.titleFlag " @click='examDetailFn(item.disciplineId)'
-                  style='width: 160rpx;display:inline-block;' shape="circle" type="primary" size='mini' text="查看考试">
-                </u-button>
-                <u-button @click='studyFn(item.disciplineId)' style='width: 160rpx;display:inline-block;' shape="circle"
-                  type="primary" size='mini' :text="item.status === '2'?'继续学习' :item.status === '1'?'开始学习':'重新学习' ">
-                </u-button>
-                <u-button v-if="item.status !== '1' && item.titleFlag " @click='examFn(item.disciplineId)'
-                  style='width: 160rpx;display:inline-block;' shape="circle" type="primary" size='mini' text="开始考试">
-                </u-button>
-
-                <!--  <u-button style='width: 160rpx;display:inline-block;' type="primary" shape="circle" size='mini'
-                  text="重新学习">
-                </u-button>
-                <u-button style='width: 160rpx;display: inline-block;' shape="circle" type="primary" size='mini'
-                  text="查看考试"></u-button>
-                <u-button style='width: 160rpx;display: inline-block;' shape="circle" type="primary" size='mini'
-                  text="继续学习"></u-button>
-                <u-button style='width: 160rpx;display: inline-block;' shape="circle" type="primary" size='mini'
-                  text="开始考试"></u-button> -->
-              </view>
-            </view>
-          </u-collapse-item>
-
-        </u-collapse>
-        <!-- <view class="download">
-          <view class="download_title">
-            附件下载
-          </view>
-          <view class="download_file">
-            <u-row customStyle="margin-bottom: 10px">
-              <u-col span="10">
-                <view class="download_file_text">
-                  撒靠akdsjj
-                </view>
-              </u-col>
-              <u-col span="2">
-                <u-button style='width: 20rpx' icon='download' type="primary" size='mini'></u-button>
-              </u-col>
-            </u-row>
-
-          </view>
-        </view> -->
-      </view>
-    </view>
-
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        projectDisciplineId: '',
-        projectDiscipline: {}, //专题课程
-        groups: [],
-      }
-    },
-    onLoad(options) {
-      this.projectDisciplineId = options.projectDisciplineId
-    },
-    onShow() {
-      this.getData()
-    },
-    methods: {
-      //
-      studyFn(disciplineId) {
-        uni.navigateTo({
-          url: `pages/learn/components/study?disciplineId=${disciplineId}&projectDisciplineId=${this.projectDiscipline.projectDisciplineId}`
-        })
-      },
-      //查看考试
-      examDetailFn(disciplineId) {
-        uni.navigateTo({
-          url: `pages/learn/components/examDetail?disciplineId=${disciplineId}&projectDisciplineId=${this.projectDiscipline.projectDisciplineId}`
-        })
-      },
-      //考试
-      examFn(disciplineId) {
-        uni.navigateTo({
-          url: `pages/learn/components/exam?disciplineId=${disciplineId}&projectDisciplineId=${this.projectDiscipline.projectDisciplineId}`
-        })
-      },
-      //获取专题详情数据
-      async getData() {
-        let params = {
-          "accountCode": this.$store.getters.usercode,
-          "projectDisciplineId": this.projectDisciplineId
-        }
-        let {
-          data
-        } = await this.$api.post('/personal/project-detail', params)
-        this.groups = data.groups
-        this.projectDiscipline = data.projectDiscipline
-      },
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  page {
-    background-color: #fff;
-  }
-
-  .header {
-    // width: 100%;
-    height: 350rpx;
-    background-color: #2F9AD2;
-  }
-
-  .describe {
-    // width: 100%;
-    // height: 240rpx;
-    font-size: 28rpx;
-    font-weight: 700;
-    background-color: #fff;
-    margin: 30rpx 20rpx;
-
-    .describe_title {
-      font-size: 28rpx;
-      color: #333333;
-    }
-
-    .describe_content {
-      font-size: 24rpx;
-      color: #666666;
-      padding: 20rpx 0;
-    }
-
-    .describe_bottom {
-      font-size: 24rpx;
-      color: #666666;
-    }
-  }
-
-  .title {
-    // width: 100%;
-    height: 88rpx;
-    background-color: #EFEFEF;
-    line-height: 88rpx;
-    padding: 0 20rpx;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-
-    .title_left {
-      font-size: 32rpx;
-    }
-
-    .title_right {
-      font-size: 28rpx;
-      color: #E95505;
-    }
-  }
-
-  .list {
-    margin-bottom: 20rpx;
-
-    .list_top {
-      display: flex;
-      width: 100%;
-      // justify-content: space-between;
-
-
-      .left {
-        flex: 1;
-        padding-right: 40rpx;
-
-        .left_title {
-          font-size: 28rpx;
-          font-weight: 700;
-        }
-
-        .left_time {
-          font-size: 28rpx;
-          color: #6C6C6C;
-          padding: 12rpx 0;
-        }
-      }
-
-      .right {
-        width: 100rpx;
-      }
-    }
-  }
-
-  .list_bottom {
-    margin-top: 20rpx;
-    // display: flex;
-    // justify-content: flex-end
-
-    float: right;
-
-    >uni-button {
-      margin-left: 20rpx;
-    }
-  }
-
-  .download {
-    padding-bottom: 20rpx;
-
-    .download_title {
-      font-size: 24rpx;
-      padding: 32rpx 0 32rpx 32rpx;
-    }
-
-    .download_file {
-      .download_file_text {
-        font-size: 24rpx;
-        color: #6DA7FF;
-        padding: 0 0 0rpx 32rpx;
-      }
-    }
-  }
-</style>

src/pages/learn/components/study.vue

@@ -1,93 +0,0 @@
-<template>
-  <view>
-    <zj-FileViewer ref="FileViewer" :fileList='fileList'></zj-FileViewer>
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        disciplineId: '',
-        projectDisciplineId: '',
-        fileList: [],
-        timer: null,
-        targetSeconds: 60
-      }
-    },
-    async onLoad(options) {
-      this.disciplineId = options.disciplineId
-      this.projectDisciplineId = options.projectDisciplineId
-      await this.getData()
-      this.openTimer()
-    },
-    onUnload() {
-      clearInterval(this.timer)
-    },
-    methods: {
-      //开启倒计时
-      openTimer() {
-        let seconds = this.targetSeconds
-        this.timer = setInterval(() => {
-          seconds--
-          if (seconds < 0) {
-            this.studyFn()
-            seconds = this.targetSeconds
-          }
-        }, 1000)
-      },
-      //学习时长
-      studyFn() {
-        let params = {
-          projectDisciplineId: this.projectDisciplineId !== '' ? this.projectDisciplineId : '',
-          projectDisciplineFlag: this.projectDisciplineId !== '' ? true : false,
-          timeLength: 1,
-          disciplineId: this.disciplineId
-        }
-        this.$api.post('/homepage/study', params)
-      },
-      //课程描述
-      async getData() {
-        let params = {
-          "accountCode": this.$store.getters.usercode,
-          "disciplineId": this.disciplineId
-        }
-        let {
-          data
-        } = await this.$api.post('/personal/detail', params)
-        this.fileList = data.disciplineUrl
-        await this.$refs.FileViewer.init();
-      }
-    }
-  }
-</script>
-
-<style scoped lang="scss">
-  .control {
-    background-color: #fff;
-    padding: 20rpx 0;
-
-    ul {
-      padding: 0;
-      list-style: none;
-      display: flex;
-      justify-content: flex-start;
-      align-items: center;
-      overflow-x: auto;
-      overflow-y: hidden;
-
-      li {
-        height: 160rpx;
-        width: 160rpx;
-        margin: 0 20rpx;
-      }
-    }
-
-
-    .li_img {
-      height: 160rpx;
-      width: 160rpx;
-
-    }
-  }
-</style>

src/pages/learn/index.vue

@@ -1,205 +0,0 @@
-<!-- 学习中心 -->
-<template>
-  <view class="wrap">
-    <u-sticky>
-      <view class="search">
-        <u-search @search='searchFn' @custom='searchFn' clearabled show-action shape="square" placeholder="搜索"
-          v-model="entryName">
-        </u-search>
-      </view>
-    </u-sticky>
-
-
-
-    <!-- <u-list @scrolltolower="scrolltolower"> -->
-    <view class="swiper">
-      <u-swiper height='150' imgMode='scaleToFill' :list="imageList"></u-swiper>
-    </view>
-    <view class="recommend">
-      <view class="font">
-        最新推荐
-      </view>
-      <u-line></u-line>
-    </view>
-    <view v-for="(item, index) in dataList" :key="index">
-      <view class="list" @click="toDetailFn(item.disciplineId)">
-        <view class="list_top">
-          <view class="tag">
-            推荐
-          </view>
-          <u--image :showLoading="true" :src="$imageUrl+item.imageUrl" width="100%" height="332rpx">
-          </u--image>
-        </view>
-        <view class="list_bottom">
-          <view class="fl">
-
-            <u--text :lines="1" :text="item.chooseFlag ===0 ? '【必修】':'【选修】' +item.disciplineName">
-            </u--text>
-          </view>
-
-
-        </view>
-        <view class="fr">
-          {{item.updateTime}}
-        </view>
-
-      </view>
-    </view>
-    <!-- </u-list> -->
-
-
-
-
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        imgUrl: this.$imageUrl,
-        entryName: '',
-        imageList: [],
-        indexList: [],
-        dataList: [],
-        pageNum: 1,
-        pageSize: 10,
-      }
-    },
-
-    async onShow() {
-      this.getCarouselList()
-      this.pageNum = 1
-      let res = await this.getList()
-      this.dataList = res
-    },
-    async onPullDownRefresh() {
-      this.pageNum = 1
-      let res = await this.getList()
-      this.dataList = res
-      uni.stopPullDownRefresh()
-    },
-    async onReachBottom() {
-      this.pageNum++
-      await this.getList()
-    },
-    methods: {
-      //获取列表数据
-      async getList() {
-        let params = {
-          "brandCodes": [],
-          "entryName": this.entryName,
-          "pageNum": this.pageNum,
-          "pageSize": this.pageSize,
-          "source": 1
-        }
-        let {
-          data
-        } = await this.$api.post('/discipline/get-ypreferred', params)
-        this.dataList = [...this.dataList, ...data.records]
-        return data.records
-      },
-      //
-      toDetailFn(disciplineId) {
-        uni.navigateTo({
-          url: `pages/learn/components/learnDetail?disciplineId=${disciplineId}`
-        })
-        // this.$router.push({
-        //   name: "learnDetail",
-        //   query: {
-        //     disciplineId
-        //   },
-        // })
-      },
-      // scrolltolower() {
-      //   this.pageNum++
-      //   this.getList()
-      // },
-
-      //搜索
-      async searchFn() {
-        this.num = 1
-        this.dataList = await this.getList()
-      },
-      //获取轮播图列表
-      async getCarouselList() {
-        let res = await this.$api.get('/base/list')
-        res.data.forEach(v => {
-          this.imageList.push(this.imgUrl + v.imgCarouselUrl)
-        })
-      },
-
-      goPage() {
-        // this.$Router.push({name:"wiki"})
-      }
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  page {
-    background-color: #fff;
-  }
-
-  .wrap {
-    padding: 0 30rpx;
-  }
-
-  .recommend {
-    font-size: 36rpx;
-    padding: 10px 0rpx;
-
-    .font {
-      padding-bottom: 10rpx;
-    }
-  }
-
-  .search {
-    padding-top: 20rpx;
-    height: 88rpx;
-    background-color: #fff;
-  }
-
-  .swiper {
-    // padding: 0 30rpx;
-  }
-
-  .list {
-    .list_top {
-      position: relative;
-
-      .tag {
-        position: absolute;
-        top: 0rpx;
-        z-index: 10;
-        font-size: 14rpx;
-        background-color: #F98640;
-        width: 80rpx;
-        height: 36rpx;
-        text-align: center;
-        color: #fff;
-        line-height: 36rpx;
-      }
-    }
-
-    .list_bottom {
-      padding: 22rpx 0rpx;
-      overflow: hidden;
-      line-height: 100%;
-      font-size: 28rpx;
-
-      .fl {
-        float: left;
-      }
-
-
-    }
-  }
-
-  .fr {
-    font-size: 28rpx;
-    text-align: right;
-    color: #A7A7A7;
-    margin-bottom: 20rpx;
-  }
-</style>

src/pages/login/indexs.vue

@@ -98,7 +98,7 @@
       }
     },
     onShow() {
-      const value = uni.getStorageSync('knowledge_mobile_login');
+      const value = uni.getStorageSync('recycle_mobile_login');
       if (value) {
         this.model.accountCode = value.usercode
         this.model.password = value.password
@@ -112,7 +112,7 @@
           usercode: this.model.accountCode,
           password: this.model.password
         }
-        uni.setStorageSync('knowledge_mobile_login', data);
+        uni.setStorageSync('recycle_mobile_login', data);
       },
       //密码显示隐藏
       eyeFn() {

src/packages/exam/index.vue → src/pages/message/index.vue

@@ -1,8 +1,7 @@
-<!-- 考试中心 -->
 <template>
-    <div>
+    <view>
 
-    </div>
+    </view>
 </template>
 
 <script>
@@ -13,4 +12,4 @@ export default {
 
 <style lang="scss" scoped>
 
-</style>
+</style>

src/pages/profile/index.vue → src/pages/mine/index.vue

@@ -80,7 +80,7 @@ export default {
     return {
       scrollTop: 0, // 滚动高度（用于控制自定义导航）
       isCustom: false, // 是否显示自定义导航
-      userInfo: uni.getStorageSync('knowledge_mobile_user'),
+      userInfo: uni.getStorageSync('recycle_mobile_user'),
 
       pageList: [
         { title: '要学', url: '/pages/profile/study/index' },

src/pages/profile/case/detail.vue

@@ -1,166 +0,0 @@
-<template>
-  <view class="">
-    <zj-FileViewer ref="FileViewer" :fileList='downloadList'></zj-FileViewer>
-    <view v-if="detail">
-      <view class="main-container">
-        <view class="main">
-          <view class="title">{{detail.caseCopywriterName}}</view>
-          <view class="row">
-            <view class="label">品牌</view>
-            <view class="value">{{detail.brandName}}</view>
-          </view>
-          <view class="row">
-            <view class="label">上传人</view>
-            <view class="value">{{detail.createName}}({{detail.createBy}})</view>
-          </view>
-          <view class="row">
-            <view class="label">发布时间</view>
-            <view class="value">{{detail.updateTime}}</view>
-          </view>
-          <view class="row">
-            <view class="label">浏览量</view>
-            <view class="value">{{detail.browseTimes}}</view>
-          </view>
-        </view>
-        <view class="content">
-          <u-parse :content="detail.disciplineOverview"></u-parse>
-        </view>
-      </view>
-
-      <u-gap height="15" bgColor="#f5f5f5"></u-gap>
-
-      <view class="download-container">
-        <u-divider text="附件下载"></u-divider>
-        <view class="item" v-for="(item, index) in downloadList" :key="index">
-          <view class="name">{{item.name}}</view>
-          <u-button @click='downloadFn(item)' text="下载" type="primary" size="mini" icon="download" class="btn">
-          </u-button>
-        </view>
-      </view>
-
-    </view>
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        id: null,
-        detail: null,
-        downloadList: [],
-      }
-    },
-
-    onLoad({
-      id
-    }) {
-      this.id = id;
-      this.getDetail();
-    },
-
-    methods: {
-      //
-      downloadFn(value) {
-        console.log(value)
-        window.open(value.fullUrl)
-        // uni.downloadFile({
-        //   url: value.fullUrl
-        // })
-      },
-      async getDetail() {
-        this.$api.post('/case-copywriter/detail', {
-          caseCopywriterId: this.id,
-          source: 1,
-          accountCode: this.$store.getters.usercode,
-        }).then(res => {
-          this.detail = res.data;
-          this.$refs.FileViewer.init();
-          this.downloadList = res.data.disciplineUrl || [];
-        })
-
-      },
-    }
-
-  }
-</script>
-
-<style lang="scss" scoped>
-  .app-container {
-    padding-bottom: 1rpx;
-  }
-
-  .main-container {
-    padding: 20rpx 30rpx;
-    background: #ffffff;
-
-    .main {
-      .title {
-        font-size: 30rpx;
-        font-weight: 500;
-      }
-
-      .row {
-        display: flex;
-        margin-top: 20rpx;
-
-        &:first-child {
-          margin-top: 0;
-        }
-
-        .label {
-          font-size: 28rpx;
-          color: #666666;
-          flex-shrink: 0;
-          width: 140rpx;
-        }
-
-        .value {
-          font-size: 28rpx;
-          color: #333333;
-        }
-
-        &.it2 {
-          .label {
-            width: 80rpx !important;
-          }
-        }
-      }
-    }
-
-    .content {
-      border-top: 1px solid #eaeaea;
-      padding: 30rpx 0;
-      margin-top: 30rpx;
-    }
-  }
-
-  .download-container {
-    padding: 20rpx 30rpx;
-    background: #ffffff;
-
-    .item {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      padding: 20rpx 0;
-      border-bottom: 1px dashed var(--border-color);
-
-      &:last-child {
-        border: none;
-      }
-
-      .name {
-        flex: 1;
-        width: 0;
-        margin-right: 30rpx;
-        font-size: 28rpx;
-        color: #333333;
-      }
-
-      .btn {
-        width: 100rpx;
-      }
-    }
-  }
-</style>

src/pages/profile/case/index.vue

@@ -1,246 +0,0 @@
-<template>
-  <view class="app-container">
-    <u-sticky bgColor="#fff">
-      <view class="search-container">
-        <u--input
-          placeholder="请输入需要搜索的内容"
-          prefixIcon="search"
-          prefixIconStyle="font-size: 22px; color: #909399;"
-          shape="circle"
-          v-model="keyword"
-        >
-        </u--input>
-        <u-button
-          class="button"
-          @tap="searchData"
-          text="搜索"
-          type="primary"
-          size="normal"
-          shape="circle"
-        ></u-button>
-      </view>
-
-      <view class="tab-container">
-        <u-tabs :list="categoryList" keyName="categoryName" @click="changeTab"></u-tabs>
-      </view>
-    </u-sticky>
-
-    <view class="list-container">
-      <view
-        class="item"
-        v-for="(item, index) in dataList"
-        :key="index"
-        @tap="toDetail(item.caseCopywriterId)">
-        <view class="title ellipsis">{{item.caseCopywriterName}}</view>
-        <view class="row">
-          <view class="label">品牌</view>
-          <view class="value">{{item.brandName}}</view>
-        </view>
-        <view class="row">
-          <view class="label">发布时间</view>
-          <view class="value">{{item.updateTime}}</view>
-        </view>
-        <view class="row">
-          <view class="label">浏览量</view>
-          <view class="value">{{item.browAmount}}</view>
-        </view>
-      </view>
-    </view>
-
-    <u-empty
-      mode="data"
-      :icon="require('@/static/common/empty_data.png')"
-      v-if="loadStatus == 'nomore' && dataList.length < 1">
-    </u-empty>
-    <u-loadmore :status="loadStatus" v-else />
-
-    <view class="bottom-container">
-      <u-button
-        class="button"
-        text="上传案例"
-        color="linear-gradient(to right, #7fdaff, #6da7ff)"
-        shape="circle"
-        @tap="toUpload">
-      </u-button>
-    </view>
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      categoryList: [],
-      curCategory: '',
-      keyword: '',
-      dataList: [],
-      pageNum: 1,
-      loadStatus: 'loadmore', // 加载前=loadmore，加载中=loading，没有数据=nomore
-    }
-  },
-
-  onLoad() {
-    this.getCategory();
-    this.getList();
-
-    uni.$on('refreshList',(result) => {
-      this.getList();
-    })
-  },
-
-  // 下拉刷新
-  onPullDownRefresh() {
-    this.pageNum = 1;
-    this.getCategory();
-    this.getList();
-  },
-
-  // 上拉加载
-  onReachBottom() {
-    this.getList(1);
-  },
-
-  methods: {
-    // 获取分类
-    getCategory() {
-      this.$api.post('/product-category/get-all', {
-        source: 1
-      }).then(res => {
-        res.data.unshift({categoryId: '', categoryName: '全部'})
-        this.categoryList = res.data;
-      })
-    },
-
-    // 获取列表
-    getList(loadMore) {
-      if(this.loadStatus == 'nomore' && loadMore)return;
-      this.loadStatus = 'loadmore';
-      if(!loadMore){
-      	this.pageNum = 1;
-      }else{
-      	this.loadStatus = 'loading';
-      }
-      this.$api.post('/personal/search', {
-        pageNum: this.pageNum,
-        pageSize: 10,
-        productCategoryId: this.curCategory,
-        entryName: this.keyword,
-        accountCode: this.$store.getters.usercode,
-      }).then(res => {
-        let _list = res.data.records;
-        let pageTotal = res.data.pages;
-        if(this.pageNum >= pageTotal){
-        	this.loadStatus = 'nomore';
-        }
-        if (_list.length) {
-        	this.pageNum += 1;
-        }
-        if (loadMore) {
-        	this.dataList = this.dataList.concat(_list);
-        	this.loadStatus = 'loadmore';
-        } else {
-        	this.dataList = _list;
-        }
-      }).catch(res => {
-        this.loadStatus = 'nomore';
-      }).finally(res => {
-        uni.stopPullDownRefresh();
-      })
-    },
-
-    // 搜索
-    searchData() {
-      this.pageNum = 1;
-      this.getList();
-    },
-
-    // 更改分类
-    changeTab(item) {
-      this.curCategory = item.productCategoryId;
-      this.pageNum = 1;
-      this.getList();
-    },
-
-    // 进入详情
-    toDetail(id) {
-      uni.navigateTo({
-        url: `pages/profile/case/detail?id=${id}`
-      });
-    },
-
-    toUpload() {
-      uni.navigateTo({
-        url: `pages/profile/case/upload`
-      });
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.app-container {
-  padding-bottom: 140rpx;
-}
-
-.search-container {
-  padding: 12rpx 30rpx;
-  position: relative;
-  .button {
-    position: absolute;
-    right: 30rpx;
-    top: 12rpx;
-    width: 140rpx;
-    height: calc(100% - 24rpx);
-  }
-}
-
-.tab-container {
-  border-bottom: 1px solid var(--bg-color);
-}
-
-.list-container {
-  padding: 20rpx 30rpx 0;
-  .item {
-    background: #ffffff;
-    border-radius: 20rpx;
-    padding: 30rpx;
-    margin-bottom: 20rpx;
-    .title {
-      font-size: 30rpx;
-      font-weight: 500;
-    }
-    .row {
-      display: flex;
-      margin-top: 14rpx;
-      &:first-child {
-        margin-top: 0;
-      }
-      .label {
-        font-size: 28rpx;
-        color: #666666;
-        flex-shrink: 0;
-        width: 140rpx;
-      }
-      .value {
-        font-size: 28rpx;
-        color: #333333;
-      }
-      &.it2 {
-        .label {
-          width: 80rpx !important;
-        }
-      }
-    }
-  }
-}
-
-.bottom-container {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  width: 100%;
-  background: #FFFFFF;
-  padding: 10rpx 30rpx;
-  box-sizing: border-box;
-}
-</style>

src/pages/profile/case/upload.vue

@@ -1,603 +0,0 @@
-<template>
-  <view class="container">
-    <view class="mian">
-      <view class="pd-b2">
-        <view class="pd-b2">*案例名称</view>
-        <u--input placeholder="请输入案例名称" border="surround" v-model="mainForm.name"></u--input>
-      </view>
-      <view class="pd-b2">
-        <view class="pd-b2">*案例描述</view>
-        <u--textarea type="text" height="120" placeholder="请输入案例描述" confirmType="done" v-model="mainForm.remark">
-        </u--textarea>
-      </view>
-      <view class="pd-b2">
-        <view class="pd-b2">*案例分类</view>
-        <u--input placeholder="请选择案例分类" border="surround" v-model="mainForm.categoryLabel" readonly
-          @click.native="isShowCategoryPicker = true"></u--input>
-      </view>
-      <view class="pd-b2">
-        <view class="pd-b2">*品牌</view>
-        <u--input placeholder="请选择品牌" border="surround" v-model="mainForm.brandLabel" readonly
-          @click.native="isShowBrandPicker = true"></u--input>
-      </view>
-      <view class="pd-b2">
-        <view class="pd-b2" style="margin-bottom: 0;">选择标签</view>
-        <view class="flex" style="align-items: flex-end; flex-wrap: wrap;">
-          <u-tag class="tag" :text="item" size="mini" plain closable v-for="(item, index) in tagList" :key="index"
-            @close="deleteTag(index)">
-          </u-tag>
-          <u-tag class="tag" text="添加标签" size="mini" plain @click="isShowPopup = true" style="margin-top: 20rpx;">
-          </u-tag>
-        </view>
-      </view>
-      <view class="pd-b2">
-        <view class="pd-b2">上传资源</view>
-        <view>
-          <view class="images">
-            <block v-for="(item, index) in fileList" :key='index'>
-              <view class="img">
-                <image :src="$imageUrl + item.url" mode="aspectFill" @tap="prevImg(item.url)"
-                  v-if="checkFileType(item.url) == 'image'"></image>
-                <img class="file" src="@/static/common/video.png" v-if="checkFileType(item.url) == 'video'" />
-                <img class="file" src="@/static/common/word.png" v-if="checkFileType(item.url) == 'word'" />
-                <img class="file" src="@/static/common/excel.png" v-if="checkFileType(item.url) == 'excel'" />
-                <img class="file" src="@/static/common/pdf.png" v-if="checkFileType(item.url) == 'pdf'" />
-                <img class="file" src="@/static/common/ppt.png" v-if="checkFileType(item.url) == 'ppt'" />
-                <text @tap="delImage(index)">x</text>
-              </view>
-            </block>
-            <view class="add" @tap="addRepairImage">
-              <u-icon name="plus"></u-icon>
-            </view>
-          </view>
-          <view class="text">
-            支持上传 excel、word、ppt、pdf、图片、视频
-          </view>
-        </view>
-      </view>
-    </view>
-    <view class="fixed">
-      <u-button class="save" :plain="true" text="保存" @tap="submitForm(0)"></u-button>
-      <u-button type="primary" class="sbumit" text="提交审核" @tap="submitForm(1)"></u-button>
-    </view>
-
-    <u-popup :show="isShowPopup" :closeable="true" :round="20" mode="bottom" @close="closeRecommendTag">
-      <view class="popup">
-        <view class="popup-title">选择标签</view>
-        <view class="popup-content">
-          <view class="popup-content-title">推荐标签</view>
-          <view class="popup-content-tags">
-            <view class="u-page__tag-item" v-for="(item, index) in recommendTagList" :key="index">
-              <u-tag class="tag" :text="item.entryName" size="mini" :plain="!item.checked" :name="index"
-                @click="clickRecommendTag">
-              </u-tag>
-            </view>
-          </view>
-          <view class="popup-content-save">
-            <u-button class="btn cancel" :plain="true" text="取消" @tap="closeRecommendTag"></u-button>
-            <u-button type="primary" class="btn confirm" text="确定" @tap="submitRecommendTag"></u-button>
-          </view>
-        </view>
-      </view>
-    </u-popup>
-
-    <u-picker title="选择分类" :show="isShowCategoryPicker" :columns="categoryList" :closeOnClickOverlay="true"
-      keyName="categoryName" @confirm="confirmCategoryPicker" @cancel="isShowCategoryPicker = false">
-    </u-picker>
-    <u-picker title="选择品牌" :show="isShowBrandPicker" :columns="brandList" :closeOnClickOverlay="true"
-      keyName="brandName" @confirm="confirmBrandPicker" @cancel="isShowBrandPicker = false">
-    </u-picker>
-
-  </view>
-</template>
-
-<script>
-  import {
-    uploadImg
-  } from '@/common/utils/util.js';
-
-  export default {
-    data() {
-      return {
-        mainForm: {
-          name: '',
-          remark: '',
-          categoryLabel: '',
-          categoryValue: '',
-          brandLabel: '',
-          brandValue: '',
-        },
-
-        categoryList: [],
-        brandList: [],
-        isShowCategoryPicker: false,
-        isShowBrandPicker: false,
-
-        tagList: [],
-        tagInputValue: '',
-        recommendTagList: [],
-
-        fileList: [],
-        isShowPopup: false,
-      }
-    },
-
-    onLoad() {
-      this.getCategoryList();
-      this.getBrandList();
-      this.getRecommendTagList();
-    },
-
-    methods: {
-      // 获取分类列表
-      getCategoryList() {
-        this.$api.post('/product-category/get-all', {
-          source: 1,
-        }).then(res => {
-          this.categoryList = [res.data];
-        })
-      },
-
-      // 获取品牌列表
-      getBrandList() {
-        this.$api.post('/brand/get-all', {
-          pageNum: 1,
-          pageSize: -1,
-          source: 1,
-        }).then(res => {
-          this.brandList = [res.data.records];
-        })
-      },
-
-      // 获取推荐标签列表
-      getRecommendTagList() {
-        this.$api.post('/entry/get-all', {
-          pageNum: 1,
-          pageSize: -1,
-        }).then(res => {
-          res.data.records.forEach(item => {
-            item.checked = false;
-          })
-          this.recommendTagList = res.data.records;
-        })
-      },
-
-      // 选择分类
-      confirmCategoryPicker(e) {
-        this.mainForm.categoryLabel = e.value[0].categoryName;
-        this.mainForm.categoryValue = e.value[0].productCategoryId;
-        this.isShowCategoryPicker = false;
-      },
-
-      // 选择品牌
-      confirmBrandPicker(e) {
-        this.mainForm.brandLabel = e.value[0].brandName;
-        this.mainForm.brandValue = e.value[0].brandCode;
-        this.isShowBrandPicker = false;
-      },
-
-      // 选择推荐标签
-      clickRecommendTag(index) {
-        this.recommendTagList[index].checked = !this.recommendTagList[index].checked;
-      },
-
-      // 关闭选择推荐标签
-      closeRecommendTag() {
-        this.recommendTagList.forEach(item => {
-          item.checked = false;
-        })
-        this.isShowPopup = false;
-      },
-
-      // 提交选择推荐标签
-      submitRecommendTag() {
-        let tags = [];
-        this.recommendTagList.forEach(item => {
-          if (item.checked) {
-            tags.push(item.entryName)
-          }
-        })
-        this.tagList = this.tagList.concat(tags);
-        this.closeRecommendTag();
-      },
-
-      // 删除标签
-      deleteTag(index) {
-        this.tagList.splice(index, 1);
-      },
-
-      // 删除图片
-      deletePic(event) {
-        this.fileList.splice(event.index, 1)
-      },
-
-
-
-      // 添加照片/视频
-      async addRepairImage() {
-        try {
-          const type = await new Promise((resolve, reject) => {
-            uni.showActionSheet({
-              itemList: ['图片', '视频', '文件'],
-              success: res => {
-                resolve(res.tapIndex)
-              },
-              fail: err => {
-                reject(0)
-              }
-            })
-          });
-          if (type == 0) {
-            this.addImage();
-          } else if (type == 1) {
-            this.addVideo();
-          } else if (type == 2) {
-            this.addFile();
-          }
-        } catch (type) {
-          if (type != 0) {
-            uni.showToast({
-              title: '上传失败',
-              icon: 'none'
-            })
-          }
-          uni.hideLoading();
-        }
-      },
-
-      async uploadFile(files) {
-        uni.showLoading({
-          title: '加载中'
-        });
-        let arr = [];
-        files.forEach(item => {
-          arr.push(uploadImg(item))
-        });
-        Promise.all(arr).then(res => {
-          let data = res.map(item => {
-            return item.data
-          })
-          this.fileList = this.fileList.concat(data)
-          console.log(this.fileList);
-        }).finally(() => {
-          uni.hideLoading();
-        })
-      },
-
-      // 添加图片
-      async addImage() {
-        uni.chooseImage({
-          success: res => {
-            console.log(res);
-            this.uploadFile(res.tempFiles);
-          },
-          fail: err => {
-            console.log(err);
-          }
-        })
-      },
-
-      // 添加视频
-      async addVideo() {
-        uni.chooseVideo({
-          success: res => {
-            console.log(res);
-            this.uploadFile([res.tempFile]);
-          },
-          fail: err => {
-            console.log(err);
-          }
-        })
-      },
-
-      // 添加文件
-      async addFile() {
-        uni.chooseFile({
-          success: res => {
-            console.log(res);
-            this.uploadFile(res.tempFiles);
-          },
-          fail: err => {
-            console.log(err);
-          }
-        })
-      },
-
-      // 删除图片
-      delImage(index) {
-        this.fileList.splice(index, 1);
-      },
-
-      //预览图片
-      prevImg(current) {
-        console.log(this.$imageUrl + current);
-        uni.previewImage({
-          current,
-          urls: this.fileList.map(item => {
-            return item.url
-          })
-        })
-      },
-
-      // 检查文件类型
-      checkFileType(url) {
-        if (!url) return ''
-        const fileSuffix = url.substring(url.lastIndexOf('.') + 1)
-
-        if (['jpg', 'jpeg', 'png'].includes(fileSuffix)) {
-          return 'image'
-        } else if (['doc', 'docx', 'dot', 'wps', 'wpt'].includes(fileSuffix)) {
-          return 'word'
-        } else if (['xls', 'xlsx', 'xlt', 'et', 'ett'].includes(fileSuffix)) {
-          return 'excel'
-        } else if (['ppt', 'pptx', 'dps', 'dpt', 'pot', 'pps'].includes(fileSuffix)) {
-          return 'ppt'
-        } else if (['pdf'].includes(fileSuffix)) {
-          return 'pdf'
-        } else if (['zip', 'rar', 'gz', 'apk'].includes(fileSuffix)) {
-          return 'file'
-        } else if (['mp3', 'mp4'].includes(fileSuffix)) {
-          return 'video'
-        } {
-          return 'pdf'
-        }
-      },
-
-      // 提交
-      submitForm(status) {
-        if (!this.mainForm.name) {
-          return this.$Prompt.toast({
-            title: '请输入案例名称'
-          });
-        }
-        if (!this.mainForm.remark) {
-          return this.$Prompt.toast({
-            title: '请输入案例描述'
-          });
-        }
-        if (!this.mainForm.categoryValue) {
-          return this.$Prompt.toast({
-            title: '请选择案例分类'
-          });
-        }
-        if (!this.mainForm.brandValue) {
-          return this.$Prompt.toast({
-            title: '请选择品牌'
-          });
-        }
-        if (this.tagList.length >= 5) {
-          return this.$Prompt.toast({
-            title: '最多可添加5个标签'
-          });
-        }
-        uni.showModal({
-          title: '提示',
-          content: '请确认内容都已填写完整，提交后若审核不通过，则不能发布也无法获得积分',
-          success: res => {
-            if (res.confirm) {
-              this.$api.post(this.id ? '/case-copywriter/update' : '/case-copywriter/create', {
-                caseCopywriterId: this.id || '',
-                caseCopywriterName: this.mainForm.name,
-                disciplineOverview: this.mainForm.remark,
-                productCategoryId: this.mainForm.categoryValue,
-                brandCode: this.mainForm.brandValue,
-                entryName: this.tagList.join(','),
-                disciplineUrl: this.fileList,
-                disciplineAmount: this.fileList.length,
-                source: 1, // 文档来源(0:管理端;1:用户端)
-                status, // 状态(0:新建保存,1:提交审核,3:提交发布)
-              }).then(res => {
-                uni.showToast({
-                  icon: 'success',
-                  title: '保存成功',
-                  duration: 1000
-                });
-                setTimeout(() => {
-                  uni.$emit('refreshList');
-                  uni.navigateBack({
-                    delta: 1
-                  });
-                }, 1000)
-              })
-            }
-          }
-        });
-      },
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  .container {
-    padding: 30rpx;
-    font-size: 28rpx;
-    color: #333333;
-    background-color: #fff;
-  }
-
-  .mian {
-    margin-bottom: 104rpx;
-  }
-
-  .pd-b2 {
-    margin-bottom: 20rpx;
-  }
-
-
-  .text {
-
-    height: 108rpx;
-    font-size: 24rpx;
-    color: #999999;
-    line-height: 28rpx;
-  }
-
-  .fixed {
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    display: flex;
-    padding: 20rpx 40rpx;
-    width: calc(100vw - 80rpx);
-    background-color: #fff;
-  }
-
-  .save {
-    width: 200rpx;
-    height: 64rpx;
-    margin-right: 20rpx;
-    background: #ffffff;
-    border: 2rpx solid #999999;
-    border-radius: 34rpx;
-  }
-
-  .sbumit {
-    width: 470rpx;
-    height: 64rpx;
-    background: linear-gradient(135deg, #7fdaff 0%, #6da7ff 100%);
-    border-radius: 32rpx;
-    border: none;
-  }
-
-  .cancel,
-  .confirm {
-    width: 330rpx;
-    height: 80rpx;
-    border-radius: 40rpx;
-  }
-
-  .confirm {
-    border: none;
-    background: linear-gradient(135deg, #7fdaff 0%, #6da7ff 100%);
-
-  }
-
-  .popup {
-    height: 740rpx;
-
-    &-title {
-      height: 88rpx;
-      padding: 0 30rpx;
-      font-size: 32rpx;
-      color: #333333;
-      line-height: 88rpx;
-      border-bottom: #c5c5c5 solid 1rpx;
-    }
-
-    &-content {
-      padding: 0 30rpx;
-
-      &-title {
-
-        height: 88rpx;
-        line-height: 88rpx;
-        font-size: 32rpx;
-        color: #999999;
-
-      }
-
-      &-tags,
-      &-save {
-        display: flex;
-      }
-
-      &-tags {
-        flex-wrap: wrap;
-        height: 400rpx;
-        overflow-y: scroll;
-
-        .tag {
-          margin-right: 20rpx;
-          margin-bottom: 20rpx;
-        }
-      }
-
-      &-save {
-        position: absolute;
-        bottom: 0;
-        left: 50%;
-        transform: translateX(-50%);
-        padding: 30rpx 0;
-        justify-content: space-between;
-
-        .cancel {
-          margin-right: 30rpx;
-        }
-      }
-    }
-  }
-
-  .images {
-    display: flex;
-    flex-wrap: wrap;
-
-    .add {
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      justify-content: center;
-      width: 146rpx;
-      height: 146rpx;
-      border: 2rpx dashed #dadada;
-      border-radius: 10rpx;
-      margin-bottom: 18rpx;
-
-      image {
-        width: 48rpx;
-        height: 34rpx;
-        display: block;
-        margin-bottom: 8rpx;
-      }
-
-      text {
-        font-size: 22rpx;
-        color: #999999;
-        line-height: 24rpx;
-      }
-    }
-
-    .img {
-      position: relative;
-      margin-right: 18rpx;
-      margin-bottom: 18rpx;
-
-      &:nth-child(4n) {
-        margin-right: 0;
-      }
-
-      image {
-        width: 150rpx;
-        height: 150rpx;
-        border-radius: 10rpx;
-        overflow: hidden;
-        display: block;
-      }
-
-      .file {
-        width: 150rpx;
-        height: 150rpx;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        border: 2rpx solid #dadada;
-        padding: 20rpx;
-        box-sizing: border-box;
-      }
-
-      text {
-        position: absolute;
-        right: -10rpx;
-        top: -10rpx;
-        width: 40rpx;
-        height: 40rpx;
-        border-radius: 50%;
-        background: #FF3F42;
-        font-size: 28rpx;
-        color: #FFFFFF;
-        text-align: center;
-        line-height: 36rpx;
-        display: block;
-      }
-    }
-  }
-</style>

src/pages/profile/certificate/index.vue

@@ -1,164 +0,0 @@
-<template>
-  <view class="app-container">
-    <view class="list-container">
-      <view class="item" v-for="(item, index) in dataList" :key="index">
-        <view class="left">
-          <view class="title">{{item.certificateName}}</view>
-          <view class="row"><view class="label">品牌</view><view class="value">{{item.brandName}}</view></view>
-          <view class="row"><view class="label">分类</view><view class="value">{{item.categoryName}}</view></view>
-          <view class="row"><view class="label">来源</view><view class="value">{{item.source}}</view></view>
-          <view class="row"><view class="label">签发时间</view><view class="value">{{item.createTime}}</view></view>
-        </view>
-        <view class="right">
-          <u-button @click='openImage(item.personalCertificateId)' size='mini' shape='circle' type='primary' text="查看证书"></u-button>
-        </view>
-      </view>
-    </view>
-    <u-empty
-      mode="data"
-      :icon="require('@/static/common/empty_data.png')"
-      v-if="loadStatus == 'nomore' && dataList.length < 1">
-    </u-empty>
-    <u-loadmore :status="loadStatus" v-else />
-
-    <!-- 弹出框 -->
-    <u-popup :show="showDialog" @close="close" mode="center">
-      <view>
-        <image :src="imageUrl" mode="" style="width: 700rpx;height: 500rpx;"></image>
-      </view>
-    </u-popup>
-
-  </view>
-</template>
-
-<script>
-
-export default {
-  data() {
-    return {
-      dataList: [],
-      pageNum: 1,
-      loadStatus: 'loadmore', // 加载前=loadmore，加载中=loading，没有数据=nomore
-
-      showDialog: false,
-      imageUrl: '',
-    }
-  },
-
-  onLoad() {
-    this.getList();
-  },
-
-  // 下拉刷新
-  onPullDownRefresh() {
-    this.pageNum = 1;
-    this.getList();
-  },
-
-  // 上拉加载
-  onReachBottom() {
-    this.getList(1);
-  },
-
-  methods: {
-    // 获取列表
-    getList(loadMore) {
-      if(this.loadStatus == 'nomore' && loadMore)return;
-      this.loadStatus = 'loadmore';
-      if(!loadMore){
-        this.pageNum = 1;
-      }else{
-        this.loadStatus = 'loading';
-      }
-      this.$api.post('/personal/certificate', {
-        pageNum: this.pageNum,
-        pageSize: 10,
-        accountCode: this.$store.getters.usercode,
-        disciplineType: 0,
-      }).then(res => {
-        let _list = res.data.records;
-        let pageTotal = res.data.pages;
-        if(this.pageNum >= pageTotal){
-          this.loadStatus = 'nomore';
-        }
-        if (_list.length) {
-          this.pageNum += 1;
-        }
-        if (loadMore) {
-          this.dataList = this.dataList.concat(_list);
-          this.loadStatus = 'loadmore';
-        } else {
-          this.dataList = _list;
-        }
-      }).catch(res => {
-        this.loadStatus = 'nomore';
-      }).finally(res => {
-        uni.stopPullDownRefresh();
-      })
-    },
-
-    close() {
-      this.showDialog = false
-    },
-    
-    // 查看证书
-    openImage(id) {
-      this.$api.post('/personal/certificate-view', {
-        personalCertificateId: id
-      }).then(res => {
-        this.imageUrl = res.data.fullUrl;
-        this.showDialog = true;
-      })
-    }
-  }
-
-}
-</script>
-
-<style lang="scss" scoped>
-  .app-container {
-    padding: 0 30rpx;
-  }
-
-  .list-container {
-    padding-top: 20rpx;
-    .item {
-      margin-bottom: 20rpx;
-      height: 220rpx;
-      background: #ffffff;
-      border-radius: 20rpx;
-      display: flex;
-      justify-content: space-between;
-      padding: 20rpx 30rpx;
-      .left {
-        display: flex;
-        flex-direction: column;
-        justify-content: space-around;
-        .title {
-          font-size: 30rpx;
-          color: #333333;
-          font-weight: 600;
-        }
-        .row {
-          font-size: 28rpx;
-          display: flex;
-          align-items: center;
-          .label {
-            color: #666666;
-            margin-right: 20rpx;
-          }
-          .value {
-            color: #333333;
-          }
-        }
-      }
-
-      .right {
-        display: flex;
-        flex-direction: column;
-        justify-content: space-around;
-      }
-    }
-
-  }
-</style>

src/pages/profile/collect/index.vue

@@ -1,133 +0,0 @@
-<template>
-  <view class="app-container">
-    <view class="user-list-container">
-      <view class="item" v-for="(item, index) in dataList" :key="index" @tap="toDetail(item)">
-        <view  @tap.stop>
-          <u--image class="img" :showLoading="true" :src="$imageUrl + item.imageUrl" width="160rpx" height="160rpx"></u--image>
-        </view>
-        <view class="main">
-          <view class="top">
-            <view class="name ellipsis">{{item.disciplineName}}</view>
-            <view class="row">品牌：{{item.brandName}}</view>
-          </view>
-          <view class="bottom">
-            <view class="date">{{item.createTime}}</view>
-            <view class="icon" @tap.stop="cancelCollect(item.collectionId)">
-              <u-icon name="star-fill" color="var(--assist-color)" size="20"></u-icon>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-    <u-empty
-      mode="data"
-      :icon="require('@/static/common/empty_data.png')"
-      v-if="loadStatus == 'nomore' && dataList.length < 1">
-    </u-empty>
-    <u-loadmore :status="loadStatus" v-else />
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      dataList: [],
-      pageNum: 1,
-      loadStatus: 'loadmore', // 加载前=loadmore，加载中=loading，没有数据=nomore
-    }
-  },
-
-  onLoad() {
-    this.getList();
-  },
-
-  // 下拉刷新
-  onPullDownRefresh() {
-    this.pageNum = 1;
-    this.getList();
-  },
-
-  // 上拉加载
-  onReachBottom() {
-    this.getList(1);
-  },
-
-  methods: {
-    // 获取列表
-    getList(loadMore) {
-      if(this.loadStatus == 'nomore' && loadMore)return;
-      this.loadStatus = 'loadmore';
-      if(!loadMore){
-      	this.pageNum = 1;
-      }else{
-      	this.loadStatus = 'loading';
-      }
-      this.$api.post('/personal/my-collection', {
-        pageNum: this.pageNum,
-        pageSize: 10,
-        disciplineType: 0,
-        accountCode: this.$store.getters.usercode,
-      }).then(res => {
-        let _list = res.data.records;
-        let pageTotal = res.data.pages;
-        if(this.pageNum >= pageTotal){
-        	this.loadStatus = 'nomore';
-        }
-        if (_list.length) {
-        	this.pageNum += 1;
-        }
-        if (loadMore) {
-        	this.dataList = this.dataList.concat(_list);
-        	this.loadStatus = 'loadmore';
-        } else {
-        	this.dataList = _list;
-        }
-      }).catch(res => {
-        this.loadStatus = 'nomore';
-      }).finally(res => {
-        uni.stopPullDownRefresh();
-      })
-    },
-
-    // 进入详情
-    toDetail(item) {
-      if(item.disciplineType == 0 || item.disciplineType == 1) {
-        uni.navigateTo({
-          url: `pages/learn/components/learnDetail?disciplineId=${item.disciplineId}`
-        });
-      }else {
-        uni.navigateTo({
-          url: `pages/learn/components/learnDetail?disciplineId=${item.disciplineId}`
-        });
-      }
-    },
-
-    // 取消收藏
-    cancelCollect(id) {
-      uni.showModal({
-        title: '提示',
-        content: '请确认是否取消收藏？',
-        success: res =>  {
-          if (res.confirm) {
-            this.$api.post('/personal/cancle', {
-              collectionId: id
-            }).then(res => {
-              this.$Prompt.toast({icon: 'success'});
-              this.pageNum = 1;
-              this.getList();
-            })
-          }
-        }
-      });
-
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.app-container {
-  padding-bottom: 1rpx;
-}
-</style>

src/pages/profile/examination/index.vue

@@ -1,183 +0,0 @@
-<template>
-  <view class="app-container">
-    <u-sticky bgColor="#fff">
-      <view class="search-container">
-        <u--input
-          placeholder="请输入关键词搜索"
-          prefixIcon="search"
-          prefixIconStyle="font-size: 22px; color: #909399;"
-          shape="circle"
-          v-model="keyword"
-        >
-        </u--input>
-        <u-button
-          class="button"
-          @tap="searchData"
-          text="搜索"
-          type="primary"
-          size="normal"
-          shape="circle"
-        ></u-button>
-      </view>
-    </u-sticky>
-
-    <view class="list-container">
-      <view
-        class="item"
-        v-for="(item, index) in dataList"
-        :key="index"
-        @tap.stop="toDetail(item.disciplineId)">
-        <view class="image">
-          <u--image class="img" :showLoading="true" :src="$imageUrl + item.imageUrl" width="690rpx" height="300rpx"></u--image>
-          <view class="status">{{item.study | statusFilter}}</view>
-        </view>
-        <view class="main">
-          <view class="name ellipsis-2">{{item.disciplineName}}</view>
-          <view class="date">有效期：{{item.lifeTime.slice(0, 4) == '2999' ? '永久有效':item.lifeTime.slice(0, 10)}}</view>
-        </view>
-      </view>
-    </view>
-
-  </view>
-</template>
-
-<script>
-export default {
-  filters: {
-    statusFilter(val) {
-      const MAP = {
-        true: '学习中',
-        false: '未开始',
-      }
-      return MAP[val];
-    }
-  },
-
-  data() {
-    return {
-      keyword: '',
-      dataList: [],
-      pageNum: 1,
-      loadStatus: 'loadmore', // 加载前=loadmore，加载中=loading，没有数据=nomore
-    }
-  },
-
-  onLoad() {
-    this.getList();
-  },
-
-  // 下拉刷新
-  onPullDownRefresh() {
-    this.pageNum = 1;
-    this.getList();
-  },
-
-  // 上拉加载
-  onReachBottom() {
-    this.getList(1);
-  },
-
-  methods: {
-    // 获取列表
-    getList(loadMore) {
-      if(this.loadStatus == 'nomore' && loadMore)return;
-      this.loadStatus = 'loadmore';
-      if(!loadMore){
-      	this.pageNum = 1;
-      }else{
-      	this.loadStatus = 'loading';
-      }
-      this.$api.post('/personal/user-test', {
-        pageNum: this.pageNum,
-        pageSize: 10,
-        accountCode: this.$store.getters.usercode,
-        entryName: this.keyword,
-      }).then(res => {
-        let _list = res.data.records;
-        let pageTotal = res.data.pages;
-        if(this.pageNum >= pageTotal){
-        	this.loadStatus = 'nomore';
-        }
-        if (_list.length) {
-        	this.pageNum += 1;
-        }
-        if (loadMore) {
-        	this.dataList = this.dataList.concat(_list);
-        	this.loadStatus = 'loadmore';
-        } else {
-        	this.dataList = _list;
-        }
-      }).catch(res => {
-        this.loadStatus = 'nomore';
-      }).finally(res => {
-        uni.stopPullDownRefresh();
-      })
-    },
-
-    // 搜索
-    searchData() {
-      this.pageNum = 1;
-      this.getList();
-    },
-
-    // 进入详情
-    toDetail(id) {
-      uni.navigateTo({
-        url: `pages/learn/components/learnDetail?disciplineId=${id}`
-      });
-    },
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.app-container {
-  padding-bottom: 1px;
-  background: #ffffff;
-}
-
-.search-container {
-  padding: 12rpx 30rpx;
-  position: relative;
-  .button {
-    position: absolute;
-    right: 30rpx;
-    top: 12rpx;
-    width: 140rpx;
-    height: calc(100% - 24rpx);
-  }
-}
-
-.list-container {
-  padding: 20rpx 30rpx 0;
-  .item {
-    margin-bottom: 30rpx;
-    .image {
-      position: relative;
-      .status {
-        position: absolute;
-        top: 0;
-        left: 20rpx;
-        padding: 10rpx 20rpx;
-        background: var(--assist-color);
-        font-size: 24rpx;
-        color: #ffffff;
-        border-radius: 0 0 10rpx 10rpx;
-      }
-    }
-    .main {
-      .name {
-        font-size: 30rpx;
-        color: #333333;
-        font-weight: 500;
-        margin-top: 10rpx;
-      }
-      .date {
-        font-size: 28rpx;
-        color: #666666;
-        margin-top: 10rpx;
-      }
-    }
-  }
-}
-</style>

src/pages/profile/lesson/index.vue

@@ -1,117 +0,0 @@
-<template>
-  <view class="app-container">
-    <view class="user-list-container">
-      <view class="item" v-for="(item, index) in dataList" :key="index" @tap="toDetail(item)">
-        <view  @tap.stop>
-          <u--image class="img" :showLoading="true" :src="$imageUrl + item.imageUrl" width="160rpx" height="160rpx"></u--image>
-        </view>
-        <view class="main">
-          <view class="top">
-            <view class="name ellipsis">{{item.disciplineName}}</view>
-            <view class="row">品牌：{{item.brandName}}</view>
-            <view class="row">分类：{{item.categoryName}}</view>
-          </view>
-          <view class="bottom">
-            <view class="date">{{item.updateTime}}</view>
-            <view class="status">{{item.status | statusFilter}}</view>
-          </view>
-        </view>
-      </view>
-    </view>
-    <u-empty
-      mode="data"
-      :icon="require('@/static/common/empty_data.png')"
-      v-if="loadStatus == 'nomore' && dataList.length < 1">
-    </u-empty>
-    <u-loadmore :status="loadStatus" v-else />
-  </view>
-</template>
-
-<script>
-export default {
-  filters: {
-    statusFilter(val) {
-      const MAP = {
-        1: '未开始',
-        2: '学习中',
-        3: '已完成',
-      }
-      return MAP[val]
-    }
-  },
-  data() {
-    return {
-      dataList: [],
-      pageNum: 1,
-      loadStatus: 'loadmore', // 加载前=loadmore，加载中=loading，没有数据=nomore
-    }
-  },
-
-  onLoad() {
-    this.getList();
-  },
-
-  // 下拉刷新
-  onPullDownRefresh() {
-    this.pageNum = 1;
-    this.getList();
-  },
-
-  // 上拉加载
-  onReachBottom() {
-    this.getList(1);
-  },
-
-  methods: {
-    // 获取列表
-    getList(loadMore) {
-      if(this.loadStatus == 'nomore' && loadMore)return;
-      this.loadStatus = 'loadmore';
-      if(!loadMore){
-      	this.pageNum = 1;
-      }else{
-      	this.loadStatus = 'loading';
-      }
-      this.$api.post('/personal/discipline', {
-        pageNum: this.pageNum,
-        pageSize: 10,
-        chooseFlag: 0,
-        status: 0,
-        accountCode: this.$store.getters.usercode,
-      }).then(res => {
-        let _list = res.data.records;
-        let pageTotal = res.data.pages;
-        if(this.pageNum >= pageTotal){
-        	this.loadStatus = 'nomore';
-        }
-        if (_list.length) {
-        	this.pageNum += 1;
-        }
-        if (loadMore) {
-        	this.dataList = this.dataList.concat(_list);
-        	this.loadStatus = 'loadmore';
-        } else {
-        	this.dataList = _list;
-        }
-      }).catch(res => {
-        this.loadStatus = 'nomore';
-      }).finally(res => {
-        uni.stopPullDownRefresh();
-      })
-    },
-
-    // 进入详情
-    toDetail(item) {
-      uni.navigateTo({
-        url: `pages/learn/components/learnDetail?disciplineId=${item.disciplineId}`
-      });
-    },
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.app-container {
-  padding-bottom: 1rpx;
-}
-</style>

src/pages/profile/other/index.vue

@@ -1,347 +0,0 @@
-<template>
-  <view class="app-container">
-    <u-sticky bgColor="#fff">
-      <view class="tab-container">
-        <u-tabs :list="tabList" :scrollable="false" @click="changeTab"></u-tabs>
-      </view>
-    </u-sticky>
-
-    <!-- 产品话术 -->
-    <view class="list-container" v-if="curTab === 1">
-      <view class="item" v-for="(item, index) in dataList" :key="index" @tap="openDetail(item.wordsTechniqueId)">
-        <view class="title">{{item.wordsTechniqueName}}</view>
-        <view class="row it2">
-          <view class="label">品牌</view>
-          <view class="value">{{item.brandName}}</view>
-        </view>
-        <view class="row it2">
-          <view class="label">答案</view>
-          <view class="value ellipsis-3">{{item.wordsTechniqueOverview}}</view>
-        </view>
-      </view>
-    </view>
-
-    <!-- 故障代码 -->
-    <view class="list-container" v-if="curTab === 2">
-      <view class="item" v-for="(item, index) in dataList" :key="index" @tap="openDetail(item.faultId)">
-        <view class="row">
-          <view class="label">产品品牌</view>
-          <view class="value">{{item.brandName}}</view>
-        </view>
-        <view class="row">
-          <view class="label">显示代码</view>
-          <view class="value">{{item.faultCode}}</view>
-        </view>
-        <view class="row">
-          <view class="label">适用产品</view>
-          <view class="value">{{item.categoryName}}</view>
-        </view>
-        <view class="row">
-          <view class="label">故障原因</view>
-          <view class="value ellipsis-3">{{item.faultWhy}}</view>
-        </view>
-        <view class="row">
-          <view class="label">备注内容</view>
-          <view class="value ellipsis-3">{{item.remark}}</view>
-        </view>
-      </view>
-    </view>
-
-    <!-- 说明书 -->
-    <view class="list-container" v-if="curTab === 3">
-      <view class="item" v-for="(item, index) in dataList" :key="index" @tap="openDetail(item.instructionsId)">
-        <view class="title">{{item.instructionsName}}</view>
-        <view class="row">
-          <view class="label">产品品牌</view>
-          <view class="value">{{item.brandName}}</view>
-        </view>
-        <view class="row">
-          <view class="label">产品型号</view>
-          <view class="value">{{item.productCode}}</view>
-        </view>
-      </view>
-    </view>
-
-    <u-empty
-      mode="data"
-      :icon="require('@/static/common/empty_data.png')"
-      v-if="loadStatus == 'nomore' && dataList.length < 1">
-    </u-empty>
-    <u-loadmore :status="loadStatus" v-else />
-
-    <u-action-sheet
-      :title="curTab | titleFilter"
-      :closeOnClickOverlay="true"
-      :show="isShowDetail"
-      :round="10"
-      @close="isShowDetail = false">
-      <!-- 产品话术 -->
-      <view class="detail-container" v-if="curTab === 1">
-        <view class="row">
-          <view class="label">品牌</view>
-          <view class="value">{{detail.brandName}}</view>
-        </view>
-        <view class="row">
-          <view class="label">产品类别</view>
-          <view class="value">{{detail.categoryName}}</view>
-        </view>
-        <view class="row">
-          <view class="label">关键字词</view>
-          <view class="value">{{detail.entryName}}</view>
-        </view>
-        <view class="row">
-          <view class="label">问题</view>
-          <view class="value ellipsis">{{detail.wordsTechniqueName}}</view>
-        </view>
-        <view class="row">
-          <view class="label">答案</view>
-          <view class="value">{{detail.wordsTechniqueOverview}}</view>
-        </view>
-      </view>
-
-      <!-- 故障代码 -->
-      <view class="detail-container" v-if="curTab === 2">
-        <view class="title">{{detail.wordsTechniqueName}}</view>
-        <view class="row">
-          <view class="label">产品品牌</view>
-          <view class="value">{{detail.brandName}}</view>
-        </view>
-        <view class="row">
-          <view class="label">显示代码</view>
-          <view class="value">{{detail.faultCode}}</view>
-        </view>
-        <view class="row">
-          <view class="label">适用产品</view>
-          <view class="value">{{detail.categoryName}}</view>
-        </view>
-        <view class="row">
-          <view class="label">产品型号</view>
-          <view class="value">{{detail.productCode}}</view>
-        </view>
-        <view class="row">
-          <view class="label">故障原因</view>
-          <view class="value ellipsis-3">{{detail.faultWhy}}</view>
-        </view>
-        <view class="row">
-          <view class="label">备注内容</view>
-          <view class="value ellipsis-3">{{detail.remark}}</view>
-        </view>
-        <view class="row">
-          <view class="label">解除条件</view>
-          <view class="value">{{detail.removeConditions}}</view>
-        </view>
-      </view>
-
-      <!-- 说明书 -->
-      <view class="detail-container" v-if="curTab === 3">
-        <view class="row">
-          <view class="label">标题</view>
-          <view class="value">{{detail.instructionsName}}</view>
-        </view>
-        <view class="row">
-          <view class="label">产品品牌</view>
-          <view class="value">{{detail.brandName}}</view>
-        </view>
-        <view class="row">
-          <view class="label">产品型号</view>
-          <view class="value">{{detail.productCode}}</view>
-        </view>
-      </view>
-    </u-action-sheet>
-
-  </view>
-</template>
-
-<script>
-export default {
-  filters: {
-    titleFilter(val) {
-      const MAP = {
-        1: '产品话术',
-        2: '故障代码',
-        3: '说明书',
-      }
-      return MAP[val]
-    }
-  },
-
-  data() {
-    return {
-      tabList: [
-        { name: '产品话术', value: 1 },
-        { name: '故障代码', value: 2 },
-        { name: '说明书', value: 3 },
-      ],
-      curTab: 1,
-      dataList: [],
-      pageNum: 1,
-      loadStatus: 'loadmore', // 加载前=loadmore，加载中=loading，没有数据=nomore
-
-      isShowDetail: false,
-      detail: {},
-    }
-  },
-
-  onLoad() {
-    this.getList();
-  },
-
-  // 下拉刷新
-  onPullDownRefresh() {
-    this.pageNum = 1;
-    this.getList();
-  },
-
-  // 上拉加载
-  onReachBottom() {
-    this.getList(1);
-  },
-
-  methods: {
-    // 获取列表
-    getList(loadMore) {
-      if(this.loadStatus == 'nomore' && loadMore)return;
-      this.loadStatus = 'loadmore';
-      if(!loadMore){
-      	this.pageNum = 1;
-      }else{
-      	this.loadStatus = 'loading';
-      }
-      let url = '';
-      if(this.curTab === 1) {
-        url = '/personal/words-technique'
-      }else if(this.curTab === 2) {
-        url = '/personal/fault'
-      }else if(this.curTab === 3) {
-        url = '/personal/instruction'
-      }
-      this.$api.post(url, {
-        pageNum: this.pageNum,
-        pageSize: 10,
-        accountCode: this.$store.getters.usercode,
-      }).then(res => {
-        let _list = res.data.records;
-        let pageTotal = res.data.pages;
-        if(this.pageNum >= pageTotal){
-        	this.loadStatus = 'nomore';
-        }
-        if (_list.length) {
-        	this.pageNum += 1;
-        }
-        if (loadMore) {
-        	this.dataList = this.dataList.concat(_list);
-        	this.loadStatus = 'loadmore';
-        } else {
-        	this.dataList = _list;
-        }
-      }).catch(res => {
-        this.loadStatus = 'nomore';
-      }).finally(res => {
-        uni.stopPullDownRefresh();
-      })
-    },
-
-    changeTab(item) {
-      this.curTab = item.value;
-      this.pageNum = 1;
-      this.getList();
-    },
-
-    openDetail(id) {
-      let url = '';
-      let param = {};
-      if(this.curTab === 1) {
-        url = '/words-technique/detail';
-        param = {wordsTechniqueId: id};
-      }else if(this.curTab === 2) {
-        url = '/fault/detail'
-        param = {faultId: id};
-      }else if(this.curTab === 3) {
-        url = '/instructions/detail'
-        param = {instructionsId: id};
-      }
-      this.$api.post(url, {
-        source: 1,
-        accountCode: this.$store.getters.usercode,
-        ...param
-      }).then(res => {
-        this.detail = res.data;
-        this.isShowDetail = true;
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.app-container {
-  padding-bottom: 1px;
-}
-
-.list-container {
-  padding: 20rpx 30rpx 0;
-  .item {
-    padding: 20rpx 30rpx;
-    background: #ffffff;
-    border-radius: 20rpx;
-    margin-bottom: 20rpx;
-    .title {
-      font-size: 30rpx;
-      font-weight: 500;
-    }
-    .row {
-      display: flex;
-      margin-top: 14rpx;
-      &:first-child {
-        margin-top: 0;
-      }
-      .label {
-        font-size: 28rpx;
-        color: #666666;
-        flex-shrink: 0;
-        width: 140rpx;
-      }
-      .value {
-        font-size: 28rpx;
-        color: #333333;
-      }
-      &.it2 {
-        .label {
-          width: 80rpx !important;
-        }
-      }
-    }
-  }
-}
-
-.detail-container {
-  padding: 20rpx 30rpx 80rpx;
-  text-align: left !important;
-  .title {
-    font-size: 30rpx;
-    font-weight: 500;
-  }
-  .row {
-    display: flex;
-    margin-top: 14rpx;
-    &:first-child {
-      margin-top: 0;
-    }
-    .label {
-      font-size: 28rpx;
-      color: #666666;
-      flex-shrink: 0;
-      width: 140rpx;
-    }
-    .value {
-      font-size: 28rpx;
-      color: #333333;
-    }
-    &.it2 {
-      .label {
-        width: 80rpx !important;
-      }
-    }
-  }
-}
-</style>

src/pages/profile/shop/addAddress.vue

@@ -1,259 +0,0 @@
-<template>
-  <view class="app-container">
-
-    <!-- 注意，如果需要兼容微信小程序，最好通过setRules方法设置rules规则 -->
-    <u--form labelPosition="left" :model="model" :rules="rules" ref="form">
-      <u-form-item label="收货人:" labelWidth='150rpx' prop="deliveryName" borderBottom ref="item1">
-        <u--input v-model="model.deliveryName" border="none"></u--input>
-      </u-form-item>
-      <u-form-item label="联系方式:" labelWidth='150rpx' prop="deliveryTele" borderBottom ref="item1">
-        <u--input v-model="model.deliveryTele" border="none"></u--input>
-      </u-form-item>
-      <u-form-item @click='regionFn(1)' label="省:" labelWidth='150rpx' prop="provinceName" borderBottom ref="item1">
-        <u--input v-model="model.provinceName" disabled disabledColor="#ffffff" border="none">
-        </u--input>
-        <u-icon slot="right" name="arrow-right"></u-icon>
-      </u-form-item>
-      <u-form-item @click='regionFn(2)' label="市:" labelWidth='150rpx' prop="cityName" borderBottom ref="item1">
-        <u--input v-model="model.cityName" disabled disabledColor="#ffffff" border="none">
-        </u--input>
-        <u-icon slot="right" name="arrow-right"></u-icon>
-      </u-form-item>
-      <u-form-item @click='regionFn(3)' label="区:" labelWidth='150rpx' prop="areaName" borderBottom ref="item1">
-        <u--input v-model="model.areaName" disabled disabledColor="#ffffff" border="none">
-        </u--input>
-        <u-icon slot="right" name="arrow-right"></u-icon>
-      </u-form-item>
-      <u-form-item @click='regionFn(4)' label="街道:" labelWidth='150rpx' prop="countyName" borderBottom ref="item1">
-        <u--input v-model="model.countyName" disabled disabledColor="#ffffff" border="none">
-        </u--input>
-        <u-icon slot="right" name="arrow-right"></u-icon>
-      </u-form-item>
-      <u-form-item label="详细地址:" labelWidth='150rpx' prop="address" borderBottom ref="item1">
-        <u--input v-model="model.address" border="none"></u--input>
-      </u-form-item>
-      <u-form-item label="设为默认地址:" labelWidth='250rpx' prop="defaultFlag" borderBottom ref="item1">
-        <view class="switch">
-          <u-switch size='20' v-model="model.defaultFlag"></u-switch>
-        </view>
-      </u-form-item>
-    </u--form>
-
-    <view class="bottom-container">
-      <u-button @tap='confirmFn' class="button" text="确定 " color="linear-gradient(to right, #7fdaff, #6da7ff)"
-        shape="circle">
-      </u-button>
-    </view>
-
-    <u-picker @cancel='cancel' @confirm="confirm" :show="show" :columns="columns" keyName="name"></u-picker>
-
-
-
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        model: {
-          address: '',
-          areaName: '',
-          cityName: '',
-          countyName: '',
-          deliveryName: '',
-          deliveryTele: '',
-          provinceName: '',
-          defaultFlag: false
-        },
-        rules: {
-          deliveryName: {
-            type: 'string',
-            required: true,
-            message: '收货人不能为空',
-            trigger: ['blur', 'change']
-          },
-          deliveryTele: [{
-              type: 'string',
-              required: true,
-              message: '联系方式不能为空',
-              trigger: ['blur', 'change']
-            },
-            {
-              min: 11,
-              max: 11,
-              message: '手机号长度为11位',
-              trigger: ['blur', 'change']
-            },
-
-          ],
-          provinceName: {
-            type: 'string',
-            required: true,
-            message: '省份不能为空',
-            trigger: ['blur', 'change']
-          },
-          cityName: {
-            type: 'string',
-            required: true,
-            message: '市不能为空',
-            trigger: ['blur', 'change']
-          },
-          areaName: {
-            type: 'string',
-            required: true,
-            message: '区不能为空',
-            trigger: ['blur', 'change']
-          },
-          countyName: {
-            type: 'string',
-            required: true,
-            message: '街道不能为空',
-            trigger: ['blur', 'change']
-          },
-          address: {
-            type: 'string',
-            required: true,
-            message: '详细地址不能为空',
-            trigger: ['blur', 'change']
-          },
-        },
-        show: false,
-        columns: [],
-        provinceList: [],
-        cityList: [],
-        areaList: [],
-        countyList: [],
-        region: ''
-      }
-    },
-    onLoad() {
-      this.getRegionList(0)
-    },
-    methods: {
-      //取消
-      cancel() {
-        this.show = false
-      },
-      //
-      async confirm(e) {
-        if (e.value[0].level === 1) {
-          this.model.provinceName = e.value[0].name
-          this.model.cityName = ''
-          this.model.areaName = ''
-          this.model.countyName = ''
-        }
-        if (e.value[0].level === 2) {
-          this.model.cityName = e.value[0].name
-          this.model.areaName = ''
-          this.model.countyName = ''
-        }
-        if (e.value[0].level === 3) {
-          this.model.areaName = e.value[0].name
-          this.model.countyName = ''
-        }
-        if (e.value[0].level === 4) {
-          this.model.countyName = e.value[0].name
-        }
-        let id = e.value[0].id
-
-        this.show = false
-        await this.getRegionList(id)
-      },
-
-      //
-      regionFn(type) {
-        this.show = true
-        if (type === 1) {
-          this.columns = [this.provinceList]
-        } else if (type === 2) {
-          this.columns = [this.cityList]
-        } else if (type === 3) {
-          this.columns = [this.areaList]
-        } else {
-          this.columns = [this.countyList]
-        }
-      },
-      //获取区域列表
-      async getRegionList(pid) {
-        let params = {
-          pid
-        }
-        let {
-          data
-        } = await this.$api.post('/base/region/list', params)
-
-        if (data[0].level === 1) {
-          this.provinceList = data
-        } else if (data[0].level === 2) {
-          this.cityList = data
-        } else if (data[0].level === 3) {
-          this.areaList = data
-        } else if (data[0].level === 4) {
-          this.countyList = data
-        }
-      },
-
-
-
-      //确定
-      async confirmFn() {
-        await this.$refs.form.validate()
-        let params = {
-          address: this.model.address,
-          areaName: this.model.areaName,
-          cityName: this.model.cityName,
-          countyName: this.model.countyName,
-          deliveryName: this.model.deliveryName,
-          deliveryTele: this.model.deliveryTele,
-          provinceName: this.model.provinceName,
-          defaultFlag: this.model.defaultFlag
-        }
-        await this.$api.post('/account/add-address', params)
-
-        uni.navigateBack({
-          delta: 1
-        })
-      }
-    }
-  }
-</script>
-
-<style lang="scss" scope>
-  page {
-    background-color: #fff;
-  }
-
-  .app-container {
-    padding: 20rpx 30rpx;
-  }
-
-  .bottom-container {
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    background: #FFFFFF;
-    padding: 10rpx 30rpx;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-  }
-
-  .address {
-    height: 1000rpx;
-  }
-
-  ::v-deep div.rg-select {
-    display: block;
-    margin-right: 0;
-    margin-bottom: 4rpx;
-  }
-
-  .switch {
-    width: 100%;
-    display: flex;
-    justify-content: end;
-  }
-</style>

src/pages/profile/shop/confirmOrder.vue

@@ -1,356 +0,0 @@
-<template>
-  <view class="app-container">
-    <view class="type-container">
-      <u-radio-group v-model="deliveryType" placement="row">
-        <u-radio label="快递发货" :name="1"></u-radio>
-        <u-radio label="用户自提" :name="0" disabled></u-radio>
-      </u-radio-group>
-    </view>
-
-    <view v-show="deliveryType === 0">
-      <view class="address-container">
-        <view class="icon">
-          <u-icon name="map-fill" color="#ffffff"></u-icon>
-        </view>
-        <view class="main" v-if="userInfo && userInfo.accountBase">
-          <view class="name">{{userInfo.accountBase.departmentName}}</view>
-          <view class="text">{{userInfo.accountBase.sinceLiftAddress}}</view>
-        </view>
-      </view>
-    </view>
-
-    <view v-show="deliveryType === 1">
-      <!-- <view class="form-container">
-        <u--input placeholder="请输入" border="bottom" clearable v-model="mainForm.name">
-          <u--text text="收货人" slot="prefix" margin="0 24px 0 0" type="tips"></u--text>
-        </u--input>
-        <u--input placeholder="请输入" border="bottom" clearable v-model="mainForm.phone">
-          <u--text text="联系电话" slot="prefix" margin="0 10px 0 0" type="tips"></u--text>
-        </u--input>
-        <u--textarea placeholder="收货地址（包含：省、市、区、街道、详细地址）" border="bottom" clearable v-model="mainForm.address"></u--textarea>
-      </view> -->
-
-      <view @tap="setAddressFn" class="address-container">
-        <view class="icon">
-          <u-icon name="map-fill" color="#ffffff"></u-icon>
-        </view>
-        <view class="main" v-if="addressData">
-          <view class="name" style="padding-bottom: 10rpx;">
-            {{addressData.deliveryName+' '+addressData.deliveryTele}}
-          </view>
-          <view class="name">{{addressData.fullAddress}}</view>
-          <view class="text">{{addressData.address}}</view>
-        </view>
-        <view class="main" v-else>
-          <view class="name" style="color: red;">
-            请添加收货地址
-          </view>
-
-        </view>
-        <view class="arrow_rigth">
-          <u-icon name="arrow-right"></u-icon>
-        </view>
-      </view>
-    </view>
-
-    <view class="goods-container">
-      <view class="title">商品信息</view>
-      <view class="list">
-        <view class="item" v-for="(item, index) in goodsList" :key="index">
-          <div @tap.stop>
-            <u--image class="img" :showLoading="true" :src="$imageUrl + item.imgUrl" width="180rpx" height="180rpx">
-            </u--image>
-          </div>
-          <view class="main">
-            <view class="name ellipsis-2">{{item.goodsName}}</view>
-            <view class="price">{{item.score}}积分</view>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <view class="num-container">
-      <u-cell-group :border="false">
-        <u-cell title="数量" :border="false">
-          <view slot="value">
-            <u-number-box v-model="number" button-size="28"></u-number-box>
-          </view>
-        </u-cell>
-      </u-cell-group>
-    </view>
-
-    <view class="bottom-container">
-      <view class="left">
-        共{{number}}件，合计：<span v-if="goodsList.length > 0">{{goodsList[0].score * number}}积分</span>
-      </view>
-      <u-button class="button" text="立即兑换" color="linear-gradient(to right, #7fdaff, #6da7ff)" shape="circle"
-        @tap="buy">
-      </u-button>
-    </view>
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        userInfo: uni.getStorageSync('knowledge_mobile_user'),
-        id: null,
-        detail: {},
-        goodsList: [],
-        number: 1,
-        deliveryType: 1,
-        mainForm: {
-          name: '',
-          phone: '',
-          address: '',
-        },
-        addressData: {}
-      }
-    },
-
-    onLoad({
-      id
-    }) {
-      this.id = id;
-    },
-    async onShow() {
-      await this.getDetail();
-      await this.addressFn()
-    },
-
-    methods: {
-      //获取地址数据
-      async addressFn() {
-        let {
-          data
-        } = await this.$api.get('/account/address-list')
-        let res = data.filter(v => v.defaultFlag)[0]
-        this.addressData = res
-      },
-      //
-      setAddressFn() {
-        uni.navigateTo({
-          url: `/pages/profile/shop/receiptAddress`
-        })
-      },
-      getDetail() {
-        this.$api.post('/goods/detail', {
-          goodsId: this.id
-        }).then(res => {
-          const data = res.data;
-          this.detail = data;
-          let imgUrlList = data.imageUrl.split(',');
-          this.goodsList = [{
-            imgUrl: imgUrlList[0],
-            goodsName: data.goodsName,
-            score: data.score,
-          }]
-        })
-      },
-
-      buy() {
-        // if (this.deliveryType === 1 && !this.mainForm.name) {
-        //   return this.$Prompt.toast({
-        //     title: '请填写收货人'
-        //   });
-        // }
-        // if (this.deliveryType === 1 && !this.mainForm.phone) {
-        //   return this.$Prompt.toast({
-        //     title: '请填写联系电话'
-        //   });
-        // }
-        // if (this.deliveryType === 1 && !this.mainForm.address) {
-        //   return this.$Prompt.toast({
-        //     title: '请填写收货地址'
-        //   });
-        // }
-        let parmas = {
-          orderSales: {
-            amount: Number(this.number),
-            commoditCode: this.detail.commoditCode,
-            itemId: 1, // 商品序
-          },
-          orderSheet: {
-            accountCode: this.$store.getters.usercode,
-            deliveryType: this.deliveryType, // 配置送方式(0=自提,1=配送)
-            // deliveryName: this.mainForm.name,
-            // deliveryTele: this.mainForm.phone,
-            // shippingAddress: this.mainForm.address,
-            deliveryName: this.addressData.deliveryName,
-            deliveryTele: this.addressData.deliveryTele,
-            shippingAddress: this.addressData.fullAddress + this.addressData.address,
-          }
-        }
-        this.$api.post('/mall/exchange', parmas).then(res => {
-          uni.navigateTo({
-            url: `pages/profile/shop/exchangeSuccess?id=${res.data}&deliveryType=${this.deliveryType}`
-          });
-        }).catch(res => {
-          uni.showModal({
-            title: '提示',
-            content: res.message,
-            showCancel: false,
-            confirmText: '好的'
-          });
-        })
-      }
-
-    }
-
-  }
-</script>
-
-<style lang="scss" scoped>
-  .app-container {
-    padding: 20rpx 30rpx;
-  }
-
-  .type-container {
-    background: #ffffff;
-    border-radius: 20rpx;
-    display: flex;
-    align-items: center;
-    padding: 20rpx 30rpx;
-    margin-bottom: 20rpx;
-
-    .u-radio {
-      margin-right: 30rpx;
-    }
-  }
-
-  .address-container {
-    background: #ffffff;
-    border-radius: 20rpx;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 20rpx 30rpx;
-
-    .icon {
-      flex-shrink: 0;
-      background: var(--theme-color);
-      width: 52rpx;
-      height: 52rpx;
-      border-radius: 50%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
-
-    .main {
-      flex: 1;
-      margin-left: 20rpx;
-
-      .name {
-        font-size: 28rpx;
-        color: #333333;
-        font-weight: 500;
-      }
-
-      .text {
-        font-size: 24rpx;
-        color: #666666;
-        margin-top: 16rpx;
-      }
-    }
-  }
-
-  .form-container {
-    background: #ffffff;
-    border-radius: 20rpx;
-    padding: 20rpx 30rpx;
-  }
-
-  .goods-container {
-    margin-top: 20rpx;
-    padding: 0 30rpx;
-    background: #ffffff;
-    border-radius: 20rpx;
-
-    .title {
-      font-size: 30rpx;
-      line-height: 70rpx;
-      color: #333333
-    }
-
-    .list {
-      padding-bottom: 1px;
-
-      .item {
-        display: flex;
-        align-items: center;
-        border-bottom: 1px solid $u-border-color;
-        margin-bottom: 20rpx;
-
-        &:last-child {
-          border: none;
-        }
-
-        img {
-          width: 180rpx;
-          height: 180rpx;
-        }
-
-        .main {
-          height: 180rpx;
-          display: flex;
-          flex-direction: column;
-          justify-content: space-between;
-          margin-left: 20rpx;
-
-          .name {
-            font-size: 28rpx;
-            color: #333333;
-            font-weight: 500;
-          }
-
-          .price {
-            font-size: 28rpx;
-            color: var(--assist-color);
-          }
-        }
-      }
-    }
-  }
-
-  .num-container {
-    margin-top: 20rpx;
-    background: #ffffff;
-    border-radius: 20rpx;
-  }
-
-  .bottom-container {
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    background: #FFFFFF;
-    padding: 10rpx 30rpx;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-
-    .left {
-      font-size: 28rpx;
-      color: #333333;
-
-      span {
-        color: var(--assist-color);
-      }
-    }
-
-    .button {
-      width: 200rpx;
-      margin: 0;
-    }
-  }
-
-  .arrow_rigth {
-    // position: absolute;
-    // right: 20rpx;
-    // top: 60rpx;
-
-  }
-</style>

src/pages/profile/shop/editAddress.vue

@@ -1,296 +0,0 @@
-<template>
-  <view class="app-container">
-
-    <!-- 注意，如果需要兼容微信小程序，最好通过setRules方法设置rules规则 -->
-    <u--form labelPosition="left" :model="model" :rules="rules" ref="form">
-      <u-form-item label="收货人:" labelWidth='150rpx' prop="deliveryName" borderBottom ref="item1">
-        <u--input v-model="model.deliveryName" border="none"></u--input>
-      </u-form-item>
-      <u-form-item label="联系方式:" labelWidth='150rpx' prop="deliveryTele" borderBottom ref="item1">
-        <u--input v-model="model.deliveryTele" border="none"></u--input>
-      </u-form-item>
-      <u-form-item @click='regionFn(1)' label="省:" labelWidth='150rpx' prop="provinceName" borderBottom ref="item1">
-        <u--input v-model="model.provinceName" disabled disabledColor="#ffffff" border="none">
-        </u--input>
-        <u-icon slot="right" name="arrow-right"></u-icon>
-      </u-form-item>
-      <u-form-item @click='regionFn(2)' label="市:" labelWidth='150rpx' prop="cityName" borderBottom ref="item1">
-        <u--input v-model="model.cityName" disabled disabledColor="#ffffff" border="none">
-        </u--input>
-        <u-icon slot="right" name="arrow-right"></u-icon>
-      </u-form-item>
-      <u-form-item @click='regionFn(3)' label="区:" labelWidth='150rpx' prop="areaName" borderBottom ref="item1">
-        <u--input v-model="model.areaName" disabled disabledColor="#ffffff" border="none">
-        </u--input>
-        <u-icon slot="right" name="arrow-right"></u-icon>
-      </u-form-item>
-      <u-form-item @click='regionFn(4)' label="街道:" labelWidth='150rpx' prop="countyName" borderBottom ref="item1">
-        <u--input v-model="model.countyName" disabled disabledColor="#ffffff" border="none">
-        </u--input>
-        <u-icon slot="right" name="arrow-right"></u-icon>
-      </u-form-item>
-      <u-form-item label="详细地址:" labelWidth='150rpx' prop="address" borderBottom ref="item1">
-        <u--input v-model="model.address" border="none"></u--input>
-      </u-form-item>
-      <u-form-item label="设为默认地址:" labelWidth='250rpx' prop="defaultFlag" borderBottom ref="item1">
-        <view class="switch">
-          <u-switch size='20' v-model="model.defaultFlag"></u-switch>
-        </view>
-      </u-form-item>
-    </u--form>
-
-    <view class="bottom-container">
-      <u-button @tap='confirmFn' class="button" text="确定 " color="linear-gradient(to right, #7fdaff, #6da7ff)"
-        shape="circle">
-      </u-button>
-    </view>
-
-    <u-picker @cancel='cancel' @confirm="confirm" :show="show" :columns="columns" keyName="name"></u-picker>
-
-
-
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        model: {
-          address: '',
-          areaName: '',
-          cityName: '',
-          countyName: '',
-          deliveryName: '',
-          deliveryTele: '',
-          provinceName: '',
-          defaultFlag: false
-        },
-        rules: {
-          deliveryName: {
-            type: 'string',
-            required: true,
-            message: '收货人不能为空',
-            trigger: ['blur', 'change']
-          },
-          deliveryTele: [{
-              type: 'string',
-              required: true,
-              message: '联系方式不能为空',
-              trigger: ['blur', 'change']
-            },
-            {
-              min: 11,
-              max: 11,
-              message: '手机号长度为11位',
-              trigger: ['blur', 'change']
-            },
-          ],
-          provinceName: {
-            type: 'string',
-            required: true,
-            message: '省份不能为空',
-            trigger: ['blur', 'change']
-          },
-          cityName: {
-            type: 'string',
-            required: true,
-            message: '市不能为空',
-            trigger: ['blur', 'change']
-          },
-          areaName: {
-            type: 'string',
-            required: true,
-            message: '区不能为空',
-            trigger: ['blur', 'change']
-          },
-          countyName: {
-            type: 'string',
-            required: true,
-            message: '街道不能为空',
-            trigger: ['blur', 'change']
-          },
-          address: {
-            type: 'string',
-            required: true,
-            message: '详细地址不能为空',
-            trigger: ['blur', 'change']
-          },
-        },
-        show: false,
-        columns: [],
-        provinceList: [],
-        cityList: [],
-        areaList: [],
-        countyList: [],
-        region: '',
-        addressDeliveryId: ''
-      }
-    },
-    async onLoad(options) {
-      this.addressDeliveryId = options.addressDeliveryId
-      await this.getRegionList(0)
-      await this.getAddressDetail()
-    },
-    methods: {
-      //获取地址详情
-      async getAddressDetail() {
-        let params = {
-          addressDeliveryId: this.addressDeliveryId
-        }
-        let {
-          data
-        } = await this.$api.post('/account/add-address-detail', params)
-        console.log(data)
-        this.model.deliveryName = data.deliveryName
-        this.model.deliveryTele = data.deliveryTele
-        this.model.address = data.address
-        this.model.defaultFlag = data.defaultFlag
-        this.model.provinceName = data.provinceName
-        this.model.cityName = data.cityName
-        this.model.areaName = data.areaName
-        this.model.countyName = data.countyName
-        for (let i = 0; i < this.provinceList.length; i++) {
-          if (this.provinceList[i].name === data.provinceName) {
-            await this.getRegionList(this.provinceList[i].id)
-          }
-        }
-        for (let i = 0; i < this.cityList.length; i++) {
-          if (this.cityList[i].name === data.cityName) {
-            await this.getRegionList(this.cityList[i].id)
-          }
-        }
-        for (let i = 0; i < this.areaList.length; i++) {
-          if (this.areaList[i].name === data.areaName) {
-            await this.getRegionList(this.areaList[i].id)
-          }
-        }
-
-
-      },
-      //取消
-      cancel() {
-        this.show = false
-      },
-      //
-      async confirm(e) {
-        if (e.value[0].level === 1) {
-          this.model.provinceName = e.value[0].name
-          this.model.cityName = ''
-          this.model.areaName = ''
-          this.model.countyName = ''
-        }
-        if (e.value[0].level === 2) {
-          this.model.cityName = e.value[0].name
-          this.model.areaName = ''
-          this.model.countyName = ''
-        }
-        if (e.value[0].level === 3) {
-          this.model.areaName = e.value[0].name
-          this.model.countyName = ''
-        }
-        if (e.value[0].level === 4) {
-          this.model.countyName = e.value[0].name
-        }
-        let id = e.value[0].id
-        this.show = false
-        await this.getRegionList(id)
-
-      },
-
-      //
-      regionFn(type) {
-        this.show = true
-        if (type === 1) {
-          this.columns = [this.provinceList]
-        } else if (type === 2) {
-          this.columns = [this.cityList]
-        } else if (type === 3) {
-          this.columns = [this.areaList]
-        } else {
-          this.columns = [this.countyList]
-        }
-      },
-      //获取区域列表
-      async getRegionList(pid) {
-        let params = {
-          pid
-        }
-        let {
-          data
-        } = await this.$api.post('/base/region/list', params)
-
-        if (data[0].level === 1) {
-          this.provinceList = data
-        } else if (data[0].level === 2) {
-          this.cityList = data
-        } else if (data[0].level === 3) {
-          this.areaList = data
-        } else if (data[0].level === 4) {
-          this.countyList = data
-        }
-      },
-
-
-
-      //确定
-      async confirmFn() {
-        await this.$refs.form.validate()
-        let params = {
-          address: this.model.address,
-          areaName: this.model.areaName,
-          cityName: this.model.cityName,
-          countyName: this.model.countyName,
-          deliveryName: this.model.deliveryName,
-          deliveryTele: this.model.deliveryTele,
-          provinceName: this.model.provinceName,
-          defaultFlag: this.model.defaultFlag,
-          addressDeliveryId: this.addressDeliveryId
-        }
-        await this.$api.post('/account/update-address', params)
-        uni.navigateBack({
-          delta: 1
-        })
-      }
-    }
-  }
-</script>
-
-<style lang="scss" scope>
-  page {
-    background-color: #fff;
-  }
-
-  .app-container {
-    padding: 20rpx 30rpx;
-  }
-
-  .bottom-container {
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    background: #FFFFFF;
-    padding: 10rpx 30rpx;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-  }
-
-  .address {
-    height: 1000rpx;
-  }
-
-  ::v-deep div.rg-select {
-    display: block;
-    margin-right: 0;
-    margin-bottom: 4rpx;
-  }
-
-  .switch {
-    width: 100%;
-    display: flex;
-    justify-content: end;
-  }
-</style>

src/pages/profile/shop/exchangeSuccess.vue

@@ -1,166 +0,0 @@
-<template>
-  <view class="app-container">
-    <view class="top-container">
-      <img src="@/static/shop/success.png" alt="">
-      <view class="title">已兑换成功</view>
-      <view class="text">你已成功兑换商品，请及时前往提货点提货！</view>
-      <u-divider></u-divider>
-      <view v-if='deliveryType === "0"' class="address">
-        <view class="row">
-          <view class="label">提货网点:</view>
-          <view class="value">广州嘉讯茂机电工程有限公司</view>
-        </view>
-        <view class="row">
-          <view class="label">提货地址:</view>
-          <view class="value">广东省广州市天河区龙洞街道天源路888号长湴矮 岭工业区二巷二楼格力售后服务中心</view>
-        </view>
-      </view>
-      <view v-if='deliveryType === "1"' class="address">
-        <view class="row">
-          <view class="label">{{'\u3000'}}收货人:</view>
-          <view class="value">{{address.deliveryName}}</view>
-        </view>
-        <view class="row">
-          <view class="label">收货电话:</view>
-          <view class="value">{{address.deliveryTele}}</view>
-        </view>
-        <view class="row">
-          <view class="label">提货地址:</view>
-          <view class="value">{{address.fullAddress+address.address}}</view>
-        </view>
-      </view>
-    </view>
-    <view class="bottom-container">
-      <u-button class="button" text="查看订单详情" shape="circle" @tap="toDetail">
-      </u-button>
-      <u-button class="button" text="返回兑换中心" color="linear-gradient(to right, #7fdaff, #6da7ff)" shape="circle"
-        @tap="backHome">
-      </u-button>
-    </view>
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        id: null,
-        deliveryType: null,
-        address: {}
-      }
-    },
-
-    onLoad({
-      id,
-      deliveryType
-    }) {
-      this.id = id;
-      this.deliveryType = deliveryType
-      if (this.deliveryType === '1') {
-        this.addressFn()
-      }
-    },
-
-    methods: {
-      //获取地址数据
-      async addressFn() {
-        let {
-          data
-        } = await this.$api.get('/account/address-list')
-        let res = data.filter(v => v.defaultFlag)[0]
-        this.address = res
-      },
-      toDetail() {
-        uni.reLaunch({
-          url: 'pages/profile/index'
-        });
-        uni.navigateTo({
-          url: 'pages/profile/shop/orderList'
-        });
-        uni.navigateTo({
-          url: `pages/profile/shop/orderDetail?id=${this.id}`
-        });
-      },
-
-      backHome() {
-        uni.reLaunch({
-          url: 'pages/profile/index'
-        });
-        uni.navigateTo({
-          url: 'pages/profile/shop/index'
-        });
-      }
-    }
-
-  }
-</script>
-
-<style lang="scss" scoped>
-  .app-container {
-    background: #ffffff;
-    height: calc(100vh - 88rpx);
-    box-sizing: border-box;
-    padding: 30rpx;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-  }
-
-  .top-container {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-
-    img {
-      width: 180rpx;
-      margin-top: 40rpx;
-    }
-
-    .title {
-      font-size: 40rpx;
-      margin-top: 40rpx;
-    }
-
-    .text {
-      font-size: 28rpx;
-      color: #333333;
-      margin-top: 40rpx;
-    }
-
-    .u-divider {
-      width: 100%;
-    }
-
-    .address {
-      width: 100%;
-
-      .row {
-        display: flex;
-        font-size: 24rpx;
-        margin-bottom: 20rpx;
-        line-height: 36rpx;
-
-        .label {
-          margin-right: 20rpx;
-          flex-shrink: 0;
-          color: #999999;
-        }
-
-        .value {
-          color: #333333;
-        }
-      }
-    }
-  }
-
-  .bottom-container {
-    display: flex;
-    flex-direction: column;
-    padding-bottom: 60rpx;
-
-    .button {
-      width: 300rpx;
-      margin-bottom: 20rpx;
-    }
-  }
-</style>

src/pages/profile/shop/goodsDetail.vue

@@ -1,149 +0,0 @@
-<template>
-  <view class="app-container">
-    <view v-if="detail">
-      <view class="swiper-container">
-        <u-swiper
-          :list="imgUrlList"
-          @change="e => currentNum = e.current"
-          :autoplay="false"
-          circular
-          height="750rpx"
-          radius="0"
-          indicatorStyle="right: 20px">
-          <view
-            slot="indicator"
-            class="indicator-num"
-          >
-            <text class="indicator-num__text">{{ currentNum + 1 }}/{{ imgUrlList.length }}</text>
-          </view>
-        </u-swiper>
-      </view>
-
-      <view class="main-container">
-        <view class="name">{{detail.goodsName}}</view>
-        <view class="price">{{detail.score}}积分</view>
-      </view>
-
-      <view class="content-container">
-        <view class="title">详情信息</view>
-        <view class="content">
-          <u-parse :content="detail.disciplineOverview"></u-parse>
-        </view>
-      </view>
-    </view>
-
-    <view class="bottom-container">
-      <u-button
-        class="button"
-        text="立即兑换"
-        color="linear-gradient(to right, #7fdaff, #6da7ff)"
-        shape="circle"
-        @tap="toBuy">
-      </u-button>
-    </view>
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      id: null,
-      detail: null,
-      imgUrlList: [],
-      currentNum: 0,
-    }
-  },
-
-  onLoad({id}) {
-    this.id = id;
-    this.getDetail();
-  },
-
-  methods: {
-    getDetail() {
-      this.$api.post('/goods/detail', {
-        goodsId: this.id
-      }).then(res => {
-        this.detail = res.data;
-        this.imgUrlList = res.data.imageUrl.split(',');
-        this.imgUrlList.forEach((item, index) => {
-          this.imgUrlList[index] = this.$imageUrl + item;
-        })
-      })
-    },
-
-    // 立即兑换
-    toBuy() {
-      uni.navigateTo({
-        url: `pages/profile/shop/confirmOrder?id=${this.id}`
-      });
-    }
-  }
-
-}
-</script>
-
-<style lang="scss" scoped>
-.app-container {
-  padding-bottom: 140rpx;
-}
-
-.swiper-container {
-  .indicator-num {
-    padding: 2px 0;
-    background-color: rgba(0, 0, 0, 0.35);
-    border-radius: 100px;
-    width: 35px;
-    @include flex;
-    justify-content: center;
-    &__text {
-      color: #FFFFFF;
-      font-size: 12px;
-    }
-  }
-}
-
-.main-container {
-  background: #FFFFFF;
-  padding: 30rpx;
-  .name {
-    font-size: 28rpx;
-    color: #333333;
-    line-height: 40rpx;
-    font-weight: 500;
-  }
-  .price {
-    font-size: 28rpx;
-    color: var(--assist-color);
-    margin-top: 20rpx;
-  }
-}
-
-.content-container {
-  background: #FFFFFF;
-  margin-top: 20rpx;
-  .title {
-    line-height: 74rpx;
-    font-size: 32rpx;
-    color: #333333;
-    text-align: center;
-    font-weight: 500;
-  }
-  .content {
-    ::v-deep img {
-      display: block;
-    }
-  }
-}
-
-.bottom-container {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  width: 100%;
-  background: #FFFFFF;
-  padding: 10rpx 30rpx;
-  box-sizing: border-box;
-}
-</style>

src/pages/profile/shop/goodsList.vue

@@ -1,214 +0,0 @@
-<template>
-  <view class="app-container">
-    <u-sticky bgColor="#fff">
-      <view class="search-container">
-        <u--input
-          placeholder="请输入需要搜索的商品名称"
-          prefixIcon="search"
-          prefixIconStyle="font-size: 22px; color: #909399;"
-          shape="circle"
-          v-model="keyword"
-        >
-        </u--input>
-        <u-button
-          class="button"
-          @tap="searchData"
-          text="搜索"
-          type="primary"
-          size="normal"
-          shape="circle"
-        ></u-button>
-      </view>
-
-      <view class="tab-container">
-        <u-tabs :list="categoryList" keyName="categoryName" @click="changeTab"></u-tabs>
-      </view>
-
-    </u-sticky>
-
-    <view class="list-container">
-      <view
-        class="item"
-        v-for="(item, index) in dataList"
-        :key="index"
-        @tap="toDetail(item.goodsId)">
-        <div @tap.stop>
-          <u--image class="img" :showLoading="true" :src="$imageUrl + item.imageUrl" width="140rpx" height="140rpx"></u--image>
-        </div>
-        <view class="main">
-          <view class="name ellipsis-2">{{item.goodsName}}</view>
-          <view class="price">{{item.score}}积分</view>
-        </view>
-      </view>
-    </view>
-    <u-empty
-      mode="data"
-      :icon="require('@/static/common/empty_data.png')"
-      v-if="loadStatus == 'nomore' && dataList.length < 1">
-    </u-empty>
-    <u-loadmore :status="loadStatus" v-else />
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      type: 0,
-      categoryList: [],
-      curCategory: '',
-      keyword: '',
-      dataList: [],
-      pageNum: 1,
-      loadStatus: 'loadmore', // 加载前=loadmore，加载中=loading，没有数据=nomore
-    }
-  },
-
-  onLoad({type}) {
-    this.type = type || 0;
-    this.getCategory();
-    this.getList();
-    uni.setNavigationBarTitle({
-      title: this.type ? '我能兑换' : '所有商品'
-    });
-  },
-
-  // 下拉刷新
-  onPullDownRefresh() {
-    this.pageNum = 1;
-    this.getCategory();
-    this.getList();
-  },
-
-  // 上拉加载
-  onReachBottom() {
-    this.getList(1);
-  },
-
-  methods: {
-    // 获取分类
-    getCategory() {
-      this.$api.post('/goods-category/get-all', {
-        pageNum: 1,
-        pageSize: -1,
-      }).then(res => {
-        res.data.records.unshift({categoryId: '', categoryName: '全部'})
-        this.categoryList = res.data.records;
-      })
-    },
-
-    // 获取列表
-    getList(loadMore) {
-      if(this.loadStatus == 'nomore' && loadMore)return;
-      this.loadStatus = 'loadmore';
-      if(!loadMore){
-      	this.pageNum = 1;
-      }else{
-      	this.loadStatus = 'loading';
-      }
-      this.$api.post(this.type ? '/mall/get-cangoods' : '/mall/get-goods', {
-        pageNum: this.pageNum,
-        pageSize: 10,
-        categoryId: this.curCategory,
-        goodsName: this.keyword,
-      }).then(res => {
-        let _list = res.data.records;
-        let pageTotal = res.data.pages;
-        if(this.pageNum >= pageTotal){
-        	this.loadStatus = 'nomore';
-        }
-        if (_list.length) {
-        	this.pageNum += 1;
-        }
-        if (loadMore) {
-        	this.dataList = this.dataList.concat(_list);
-        	this.loadStatus = 'loadmore';
-        } else {
-        	this.dataList = _list;
-        }
-      }).catch(res => {
-        this.loadStatus = 'nomore';
-      }).finally(res => {
-        uni.stopPullDownRefresh();
-      })
-    },
-
-    // 搜索
-    searchData() {
-      this.pageNum = 1;
-      this.getList();
-    },
-
-    // 更改分类
-    changeTab(item) {
-      this.curCategory = item.categoryId;
-      this.pageNum = 1;
-      this.getList();
-    },
-
-    // 进入详情
-    toDetail(id) {
-      uni.navigateTo({
-        url: `pages/profile/shop/goodsDetail?id=${id}`
-      });
-    },
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.app-container {
-  padding-bottom: 1px;
-}
-
-.search-container {
-  padding: 12rpx 30rpx;
-  position: relative;
-  .button {
-    position: absolute;
-    right: 30rpx;
-    top: 12rpx;
-    width: 140rpx;
-    height: calc(100% - 24rpx);
-  }
-}
-
-.tab-container {
-  border-bottom: 1px solid var(--bg-color);
-}
-
-.list-container {
-  margin-top: 20rpx;
-  padding: 0 30rpx;
-  background: #ffffff;
-  .item {
-    display: flex;
-    align-items: center;
-    padding: 20rpx 0;
-    border-bottom: 1px solid $u-border-color;
-    &:last-child {
-      border: none;
-    }
-    img {
-      width: 140rpx;
-      height: 140rpx;
-    }
-    .main {
-      height: 140rpx;
-      display: flex;
-      flex-direction: column;
-      justify-content: space-between;
-      margin-left: 20rpx;
-      .name {
-        font-size: 28rpx;
-        color: #333333;
-        font-weight: 500;
-      }
-      .price {
-        font-size: 28rpx;
-        color: var(--assist-color);
-      }
-    }
-  }
-}
-</style>

src/pages/profile/shop/index.vue

@@ -1,205 +0,0 @@
-<template>
-  <view class="app-container">
-    <!-- <view class="swiper-container">
-      <u-swiper
-        indicator
-        indicatorMode="line"
-        circular
-        :list="swiperList">
-      </u-swiper>
-    </view> -->
-    <view class="nav-container">
-      <view class="item" @tap="linkTo('pages/profile/shop/myScore', {})">
-        <img src="@/static/shop/icon_1.png" alt="">
-        <view>积分查询</view>
-      </view>
-      <view class="item" @tap="linkTo('pages/profile/shop/goodsList', {type: 1})">
-        <img src="@/static/shop/icon_2.png" alt="">
-        <view>我能兑换</view>
-      </view>
-      <view class="item" @tap="linkTo('pages/profile/shop/goodsList', {})">
-        <img src="@/static/shop/icon_3.png" alt="">
-        <view>分类查询</view>
-      </view>
-      <view class="item" @tap="linkTo('pages/profile/shop/orderList', {})">
-        <img src="@/static/shop/icon_4.png" alt="">
-        <view>兑换记录</view>
-      </view>
-    </view>
-    <view class="title-container">
-      <view class="title">积分兑好礼</view>
-      <view class="more" @tap="linkTo('pages/profile/shop/goodsList', {})">更多<u-icon size="12" name="arrow-right" color="var(--theme-color)"></u-icon></view>
-    </view>
-    <view class="list-container">
-      <view
-        class="item"
-        v-for="(item, index) in dataList"
-        :key="index"
-        @tap="linkTo('pages/profile/shop/goodsDetail', {id: item.goodsId})">
-        <div @tap.stop>
-          <u--image class="img" :showLoading="true" :src="$imageUrl + item.imageUrl" width="140rpx" height="140rpx"></u--image>
-        </div>
-        <view class="main">
-          <view class="name ellipsis-2">{{item.goodsName}}</view>
-          <view class="price">{{item.score}}积分</view>
-        </view>
-      </view>
-    </view>
-    <u-empty
-      mode="data"
-      :icon="require('@/static/common/empty_data.png')"
-      v-if="loadStatus == 'nomore' && dataList.length < 1">
-    </u-empty>
-    <u-loadmore :status="loadStatus" v-else />
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      swiperList: [
-        'https://cdn.uviewui.com/uview/swiper/swiper1.png',
-      ],
-      dataList: [],
-      pageNum: 1,
-      loadStatus: 'loadmore', // 加载前=loadmore，加载中=loading，没有数据=nomore
-    }
-  },
-
-  onLoad() {
-    this.getList();
-  },
-
-  // 下拉刷新
-  onPullDownRefresh() {
-    this.pageNum = 1;
-    this.getList();
-  },
-
-  // 上拉加载
-  onReachBottom() {
-    this.getList(1);
-  },
-
-  methods: {
-    // 获取列表
-    getList(loadMore) {
-      if(this.loadStatus == 'nomore' && loadMore) return;
-      this.loadStatus = 'loadmore';
-      if(!loadMore){
-      	this.pageNum = 1;
-      }else{
-      	this.loadStatus = 'loading';
-      }
-      this.$api.post('/mall/get-goods', {
-        pageNum: this.pageNum,
-        pageSize: 10,
-        categoryId: '',
-        goodsName: '',
-      }).then(res => {
-        let _list = res.data.records;
-        let pageTotal = res.data.pages;
-        if(this.pageNum >= pageTotal){
-        	this.loadStatus = 'nomore';
-        }
-        if (_list.length) {
-        	this.pageNum += 1;
-        }
-        if (loadMore) {
-        	this.dataList = this.dataList.concat(_list);
-        	this.loadStatus = 'loadmore';
-        } else {
-        	this.dataList = _list;
-        }
-      }).catch(res => {
-        this.loadStatus = 'nomore';
-      }).finally(res => {
-        uni.stopPullDownRefresh();
-      })
-    },
-
-    // 页面跳转
-    linkTo(url, query) {
-      let str = '';
-      if(query) {
-        for(let i in query) {
-          str = '?' + str + i + '=' + query[i];
-        }
-      }
-      uni.navigateTo({
-        url: `${url}${str}`
-      });
-    },
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-.app-container {
-  min-height: calc(100vh - 88rpx);
-  background: #ffffff;
-  padding-bottom: 1px;
-}
-.nav-container {
-  display: flex;
-  padding: 40rpx 0;
-  .item {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    img {
-      width: 52rpx;
-      height: 52rpx;
-    }
-    view {
-      font-size: 28rpx;
-      margin-top: 20rpx;
-      color: #333333;
-    }
-  }
-}
-.title-container {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 0 30rpx;
-  .title {
-    font-size: 32rpx;
-    color: #333333;
-    font-weight: 600;
-  }
-  .more {
-    color: var(--theme-color);
-    display: flex;
-    align-items: center;
-    font-size: 28rpx;
-  }
-}
-.list-container {
-  padding: 10rpx 30rpx 0;
-  .item {
-    display: flex;
-    align-items: center;
-    padding: 20rpx 0;
-    border-bottom: 1px solid $u-border-color;
-    .main {
-      height: 140rpx;
-      display: flex;
-      flex-direction: column;
-      justify-content: space-between;
-      margin-left: 20rpx;
-      .name {
-        font-size: 28rpx;
-        color: #333333;
-        font-weight: 500;
-      }
-      .price {
-        font-size: 28rpx;
-        color: var(--assist-color);
-      }
-    }
-  }
-}
-</style>

src/pages/profile/shop/myScore.vue

@@ -1,183 +0,0 @@
-<template>
-  <view class="app-container">
-    <view class="top-container">
-      <view class="num">{{score}}</view>
-      <view class="text">我的积分</view>
-    </view>
-
-    <u-sticky bgColor="#fff">
-      <view class="tab-container">
-        <u-tabs :list="tabList" :scrollable="false" @click="changeTab"></u-tabs>
-      </view>
-    </u-sticky>
-
-    <view class="list-container">
-      <view
-        class="item"
-        v-for="(item, index) in dataList"
-        :key="index">
-        <view class="left">
-          <view class="title ellipsis">{{item.disciplineName}}</view>
-          <view class="text">
-            <span>来源：{{item.eventName}}</span>
-            <span>时间：{{item.createTime}}</span>
-          </view>
-        </view>
-        <view class="number" :class="item.occur > 0 ? 'red':'green'">{{item.occur > 0 ? '+':''}}{{item.occur}}</view>
-      </view>
-    </view>
-    <u-loadmore :status="loadStatus" />
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      score: uni.getStorageSync('knowledge_mobile_user').accountInfoMsg.exchangeScore,
-      tabList: [
-        { name: '全部', value: 0 },
-        { name: '获取记录', value: 1 },
-        { name: '使用记录', value: 2 },
-      ],
-      curTab: 0,
-      dataList: [],
-      pageNum: 1,
-      loadStatus: 'loadmore', // 加载前=loadmore，加载中=loading，没有数据=nomore
-    }
-  },
-
-  onLoad() {
-    this.getList();
-  },
-
-  // 下拉刷新
-  onPullDownRefresh() {
-    this.pageNum = 1;
-    this.getList();
-  },
-
-  // 上拉加载
-  onReachBottom() {
-    this.getList(1);
-  },
-
-  methods: {
-    // 获取列表
-    getList(loadMore) {
-      if(this.loadStatus == 'nomore' && loadMore)return;
-      this.loadStatus = 'loadmore';
-      if(!loadMore){
-      	this.pageNum = 1;
-      }else{
-      	this.loadStatus = 'loading';
-      }
-      this.$api.post('/personal/score', {
-        pageNum: this.pageNum,
-        pageSize: 10,
-        type: this.curTab,
-        accountCode: this.$store.getters.usercode,
-      }).then(res => {
-        let _list = res.data.records;
-        let pageTotal = res.data.pages;
-        if(this.pageNum >= pageTotal){
-        	this.loadStatus = 'nomore';
-        }
-        if (_list.length) {
-        	this.pageNum += 1;
-        }
-        if (loadMore) {
-        	this.dataList = this.dataList.concat(_list);
-        	this.loadStatus = 'loadmore';
-        } else {
-        	this.dataList = _list;
-        }
-      }).catch(res => {
-        this.loadStatus = 'nomore';
-      }).finally(res => {
-        uni.stopPullDownRefresh();
-      })
-    },
-
-    changeTab(item) {
-      this.curTab = item.value;
-      this.pageNum = 1;
-      this.getList();
-    },
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.app-container {
-  padding-bottom: 1px;
-}
-.top-container {
-  background: #ffffff;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  height: 140rpx;
-  border-bottom: 1px solid var(--bg-color);
-  .num {
-    font-size: 40rpx;
-    line-height: 40rpx;
-    color: var(--assist-color);
-    font-weight: 600;
-  }
-  .text {
-    font-size: 28rpx;
-    color: #333333;
-    margin-top: 10rpx;
-  }
-}
-
-.tab-container {
-  border-bottom: 1px solid var(--bg-color);
-}
-
-.list-container {
-  background: #ffffff;
-  margin-top: 20rpx;
-  .item {
-    display: flex;
-    align-items: center;
-    padding: 20rpx 30rpx;
-    border-bottom: 1px dashed #eaeaea;
-    &:last-child {
-      border: none;
-    }
-    .left {
-      width: 0;
-      flex: 1;
-      margin-right: 30rpx;
-      .title {
-        font-size: 28rpx;
-        color: #333333;
-      }
-      .text {
-        margin-top: 10rpx;
-        span {
-          font-size: 24rpx;
-          color: #999999;
-          margin-right: 30rpx;
-        }
-      }
-    }
-    .number {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      font-size: 32rpx;
-      flex-shrink: 0;
-      &.red {
-        color: var(--error-color);
-      }
-      &.green {
-        color: var(--success-color);
-      }
-    }
-  }
-}
-</style>

src/pages/profile/shop/orderDetail.vue

@@ -1,360 +0,0 @@
-<template>
-  <view class="app-container">
-    <view v-if="detail.orderInfo">
-      <u-sticky bgColor="#fff">
-        <view class="status-container">{{detail.orderInfo.status | statusFilter}}</view>
-      </u-sticky>
-
-      <view class="main-container">
-        <view class="address-container">
-          <view class="icon">
-            <u-icon name="map-fill" color="#ffffff"></u-icon>
-          </view>
-          <view class="main">
-            <!-- <view class="name">{{detail.address.sinceLiftName}}</view> -->
-            <view class="name">{{detail.orderInfo.deliveryName + ' ' +detail.orderInfo.deliveryTele}}</view>
-            <view class="text">{{detail.address.sinceLiftAddress}}</view>
-          </view>
-        </view>
-
-        <view class="goods-container">
-          <view class="title">商品信息</view>
-          <view class="list">
-            <view class="item" v-for="(item, index) in goodsList" :key="index">
-              <div class="main">
-                <div @tap.stop>
-                  <u--image class="img" :showLoading="true" :src="$imageUrl + item.imageUrl" width="140rpx"
-                    height="140rpx"></u--image>
-                </div>
-                <view class="right">
-                  <view class="name ellipsis-2">{{item.goodsName}}</view>
-                  <view class="text">
-                    <view class="price">{{item.score}}积分</view>
-                    <view class="num">x{{item.amount}}</view>
-                  </view>
-                </view>
-              </div>
-              <div class="bottom">
-                <div class="price">合计：<span>{{item.payScore}}积分</span></div>
-              </div>
-            </view>
-          </view>
-        </view>
-        <view class="order-container">
-          <view class="title">订单信息</view>
-          <view class="row">
-            <view class="label">订单号</view>
-            <view class="value">{{detail.orderInfo.orderSheetId}}</view>
-          </view>
-          <view class="row">
-            <view class="label">兑换日期</view>
-            <view class="value">{{detail.orderInfo.reqTime}}</view>
-          </view>
-          <view class="row">
-            <view class="label">兑换人</view>
-            <!-- <view class="value">{{detail.orderInfo.userName}}({{detail.orderInfo.accountCode}})</view> -->
-            <view class="value">{{detail.orderInfo.userName}}</view>
-          </view>
-          <view class="row">
-            <view class="label">兑换人电话</view>
-            <view class="value">{{detail.orderInfo.tele}}</view>
-          </view>
-          <view class="row">
-            <view class="label">提货日期</view>
-            <view class="value">{{detail.orderInfo.updateTime || '-'}}</view>
-          </view>
-        </view>
-      </view>
-
-      <view class="bottom-container" v-if="detail.orderInfo.status !== '已完成' && detail.orderInfo.status !== '已取消'">
-        <u-button class="button" text="取消订单" shape="circle" @tap="cancelData">
-        </u-button>
-        <u-button class="button" text="确认收货" color="linear-gradient(to right, #7fdaff, #6da7ff)" shape="circle"
-          @tap="confirmData">
-        </u-button>
-      </view>
-    </view>
-
-    <u-empty mode="data" :icon="require('@/static/common/empty_data.png')" v-if="!isLoading && !detail.orderInfo">
-    </u-empty>
-  </view>
-</template>
-
-<script>
-  export default {
-    filters: {
-      statusFilter(val) {
-        const MAP = {
-          '已兑换': '已兑换成功，待提货',
-          '已完成': '已完成提货',
-          '已取消': '已取消'
-        }
-        return MAP[val];
-      }
-    },
-
-    data() {
-      return {
-        isLoading: true,
-        id: null,
-        detail: {},
-        goodsList: [],
-      }
-    },
-
-    onLoad({
-      id
-    }) {
-      this.id = id;
-      this.getDetail();
-    },
-
-    methods: {
-      getDetail() {
-        this.$api.post('/order/detail', {
-          orderSheetId: this.id
-        }).then(res => {
-          const data = res.data;
-          this.detail = data;
-          let imgUrlList = data.goodsInfo.imageUrl.split(',');
-          data.goodsInfo.imageUrl = imgUrlList[0];
-          this.goodsList = [data.goodsInfo];
-        }).finally(res => {
-          this.isLoading = false;
-        })
-      },
-
-      // 确认收货
-      confirmData() {
-        uni.showModal({
-          title: '提示',
-          content: '请确认是否确认提货？',
-          success: res => {
-            if (res.confirm) {
-              this.$api.post('/order/confirm', {
-                orderSheetId: this.id,
-                updateBy: this.$store.getters.usercode
-                // updateBy: this.usercode
-              }).then(res => {
-                this.$Prompt.toast({
-                  icon: 'success'
-                });
-                this.getDetail();
-              })
-            }
-          }
-        });
-      },
-
-      // 取消订单
-      cancelData() {
-        uni.showModal({
-          title: '提示',
-          content: '请确认是否取消订单？',
-          success: res => {
-            if (res.confirm) {
-              this.$api.post('/order/cancel', {
-                orderSheetId: this.id,
-                updateBy: this.$store.getters.usercode
-                // updateBy: this.usercode
-              }).then(res => {
-                this.$Prompt.toast({
-                  icon: 'success'
-                });
-                this.getDetail();
-              })
-            }
-          }
-        });
-      }
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  .main-container {
-    padding: 20rpx 30rpx;
-  }
-
-  .status-container {
-    background: var(--theme-color);
-    height: 70rpx;
-    color: #ffffff;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-
-  .address-container {
-    background: #ffffff;
-    border-radius: 20rpx;
-    display: flex;
-    align-items: center;
-    padding: 20rpx 30rpx;
-
-    .icon {
-      flex-shrink: 0;
-      background: var(--theme-color);
-      width: 52rpx;
-      height: 52rpx;
-      border-radius: 50%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
-
-    .main {
-      margin-left: 20rpx;
-
-      .name {
-        font-size: 28rpx;
-        color: #333333;
-        font-weight: 500;
-      }
-
-      .text {
-        font-size: 24rpx;
-        color: #666666;
-        margin-top: 16rpx;
-      }
-    }
-  }
-
-  .goods-container {
-    margin-top: 20rpx;
-    padding: 0 30rpx;
-    background: #ffffff;
-    border-radius: 20rpx;
-
-    .title {
-      font-size: 30rpx;
-      line-height: 70rpx;
-      color: #333333
-    }
-
-    .list {
-      padding-bottom: 1px;
-
-      .item {
-        border-bottom: 1px solid $u-border-color;
-
-        &:last-child {
-          border: none;
-        }
-
-        .main {
-          display: flex;
-          align-items: center;
-
-          img {
-            width: 140rpx;
-            height: 140rpx;
-          }
-
-          .right {
-            height: 140rpx;
-            display: flex;
-            flex-direction: column;
-            justify-content: space-between;
-            margin-left: 20rpx;
-
-            .name {
-              font-size: 28rpx;
-              color: #333333;
-              font-weight: 500;
-            }
-
-            .text {
-              display: flex;
-
-              // flex-direction: column;
-              .price {
-                font-size: 24rpx;
-                color: #666666;
-              }
-
-              .num {
-                font-size: 24rpx;
-                color: #666666;
-                margin-left: 10rpx;
-              }
-            }
-          }
-        }
-
-        .bottom {
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-          height: 70rpx;
-          border-top: 1px solid var(--bg-color);
-          margin-top: 20rpx;
-
-          .price {
-            font-size: 28rpx;
-            color: #666666;
-
-            span {
-              color: var(--assist-color);
-            }
-          }
-
-          .button {
-            width: 140rpx;
-            margin: 0;
-          }
-        }
-      }
-    }
-  }
-
-  .order-container {
-    margin-top: 20rpx;
-    padding: 0 30rpx 1rpx;
-    background: #ffffff;
-    border-radius: 20rpx;
-
-    .title {
-      font-size: 30rpx;
-      line-height: 70rpx;
-      color: #333333;
-      margin-bottom: 5rpx;
-    }
-
-    .row {
-      display: flex;
-      align-items: center;
-      margin-bottom: 20rpx;
-
-      .label {
-        font-size: 28rpx;
-        color: #999999;
-        width: 160rpx;
-      }
-
-      .value {
-        font-size: 28rpx;
-        color: #000000;
-      }
-    }
-  }
-
-  .bottom-container {
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    background: #FFFFFF;
-    padding: 10rpx 30rpx;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-
-    .button {
-      width: 200rpx;
-      margin: 0;
-      margin-left: 20rpx;
-    }
-  }
-</style>

src/pages/profile/shop/orderList.vue

@@ -1,259 +0,0 @@
-<template>
-  <view class="app-container">
-    <u-sticky bgColor="#fff">
-      <view class="tab-container">
-        <u-tabs :list="tabList" :scrollable="false" @click="changeTab"></u-tabs>
-      </view>
-    </u-sticky>
-
-    <view class="list-container">
-      <view
-        class="item"
-        v-for="(item, index) in dataList"
-        :key="index"
-        @tap="toDetail(item.orderSheetId)">
-        <div class="top">
-          <div class="id">{{item.orderSheetId}}</div>
-          <div class="status">{{item.status}}</div>
-        </div>
-        <div class="main">
-          <div @tap.stop>
-            <u--image class="img" :showLoading="true" :src="$imageUrl + item.imageUrl" width="140rpx" height="140rpx"></u--image>
-          </div>
-          <view class="right">
-            <view class="name ellipsis-2">{{item.goodsName}}</view>
-            <view class="text">
-              <view class="price">{{item.score}}积分</view>
-              <view class="num">x{{item.amount}}</view>
-            </view>
-          </view>
-        </div>
-        <div class="bottom">
-          <div class="price">合计：<span>{{item.payScore}}积分</span></div>
-          <view @tap.stop>
-            <u-button
-              v-if="item.status !== '已完成' && item.status !== '已取消'"
-              class="button"
-              text="确认收货"
-              color="linear-gradient(to right, #7fdaff, #6da7ff)"
-              shape="circle"
-              size="mini"
-              @tap="confirmData(item.orderSheetId)">
-            </u-button>
-          </view>
-        </div>
-      </view>
-    </view>
-    <u-empty
-      mode="data"
-      :icon="require('@/static/common/empty_data.png')"
-      v-if="loadStatus == 'nomore' && dataList.length < 1">
-    </u-empty>
-    <u-loadmore :status="loadStatus" v-else />
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      tabList: [
-        { name: '全部', value: 0 },
-        { name: '待提货', value: 1 },
-        { name: '已完成', value: 3 },
-        { name: '已取消', value: 99 },
-      ],
-      curTab: 0,
-      dataList: [],
-      pageNum: 1,
-      loadStatus: 'loadmore', // 加载前=loadmore，加载中=loading，没有数据=nomore
-    }
-  },
-
-  onLoad() {
-    this.getList();
-  },
-
-  // 下拉刷新
-  onPullDownRefresh() {
-    this.pageNum = 1;
-    this.getList();
-  },
-
-  // 上拉加载
-  onReachBottom() {
-    this.getList(1);
-  },
-
-  methods: {
-    // 获取列表
-    getList(loadMore) {
-      if(this.loadStatus == 'nomore' && loadMore)return;
-      this.loadStatus = 'loadmore';
-      if(!loadMore){
-      	this.pageNum = 1;
-      }else{
-      	this.loadStatus = 'loading';
-      }
-      this.$api.post('/personal/my-order', {
-        pageNum: this.pageNum,
-        pageSize: 10,
-        type: this.curTab,
-        accountCode: this.$store.getters.usercode,
-      }).then(res => {
-        res.data.records.forEach(item => {
-          let imgs = item.imageUrl.split(',');
-          item.imageUrl = imgs.length > 0 ? imgs[0] : '';
-        });
-        let _list = res.data.records;
-        let pageTotal = res.data.pages;
-        if(this.pageNum >= pageTotal){
-        	this.loadStatus = 'nomore';
-        }
-        if (_list.length) {
-        	this.pageNum += 1;
-        }
-        if (loadMore) {
-        	this.dataList = this.dataList.concat(_list);
-        	this.loadStatus = 'loadmore';
-        } else {
-        	this.dataList = _list;
-        }
-      }).catch(res => {
-        this.loadStatus = 'nomore';
-      }).finally(res => {
-        uni.stopPullDownRefresh();
-      })
-    },
-
-    changeTab(item) {
-      this.curTab = item.value;
-      this.pageNum = 1;
-      this.getList();
-    },
-
-    // 进入详情
-    toDetail(id) {
-      uni.navigateTo({
-        url: `pages/profile/shop/orderDetail?id=${id}`
-      });
-    },
-
-    // 确认收货
-    confirmData(id) {
-      uni.showModal({
-        title: '提示',
-        content: '请确认是否确认提货？',
-        success: res =>  {
-          if (res.confirm) {
-            this.$api.post('/order/confirm', {
-              orderSheetId: id,
-              updateBy: this.$store.getters.usercode
-              // updateBy: this.usercode
-            }).then(res => {
-              this.$Prompt.toast({
-                title: '操作成功',
-                icon: 'success',
-              });
-              setTimeout(() => {
-                this.pageNum = 1;
-                this.getList();
-              }, 1000)
-            })
-          }
-        }
-      });
-    },
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.app-container {
-  padding-bottom: 1px;
-}
-
-.tab-container {
-  border-bottom: 1px solid var(--bg-color);
-}
-
-.list-container {
-  margin-top: 20rpx;
-  padding: 0 30rpx;
-  .item {
-    padding: 0 30rpx;
-    background: #ffffff;
-    margin-bottom: 20rpx;
-    border-radius: 20rpx;
-    &:last-child {
-      margin-bottom: 0;
-    }
-    .top {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      height: 70rpx;
-      .id {
-        font-size: 28rpx;
-        color: #333333;
-      }
-      .status {
-        font-size: 28rpx;
-        color: var(--theme-color);
-      }
-    }
-    .main {
-      display: flex;
-      align-items: center;
-      img {
-        width: 140rpx;
-        height: 140rpx;
-      }
-      .right {
-        height: 140rpx;
-        display: flex;
-        flex-direction: column;
-        justify-content: space-between;
-        margin-left: 20rpx;
-        .name {
-          font-size: 28rpx;
-          color: #333333;
-          font-weight: 500;
-        }
-        .text {
-          display: flex;
-          // flex-direction: column;
-          .price {
-            font-size: 24rpx;
-            color: #666666;
-          }
-          .num {
-            font-size: 24rpx;
-            color: #666666;
-            margin-left: 10rpx;
-          }
-        }
-      }
-    }
-    .bottom {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      height: 70rpx;
-      border-top: 1px solid var(--bg-color);
-      margin-top: 20rpx;
-      .price {
-        font-size: 28rpx;
-        color: #666666;
-        span {
-          color: var(--assist-color);
-        }
-      }
-      .button {
-        width: 140rpx;
-        margin: 0;
-      }
-    }
-  }
-}
-</style>

src/pages/profile/shop/receiptAddress.vue

@@ -1,165 +0,0 @@
-<template>
-  <view class="app-container">
-
-
-    <u-swipe-action>
-      <u-swipe-action-item @click='deleteFn(v.addressDeliveryId)' v-for="(v,i) in list" :key="i" :options="options1">
-        <u-radio-group @change='changeFn(v.addressDeliveryId)' v-model="radiovalue1" placement="column">
-          <view @tap="toEditAddress(v.addressDeliveryId)" class="address">
-            <view class="address_radio">
-              <u-radio :customStyle="{marginBottom: '0px'}" label="" :name="i">
-              </u-radio>
-            </view>
-            <view class="address_center">
-              <view class="">
-                {{v.deliveryName+' '+v.deliveryTele}}
-                <text v-if="v.defaultFlag" class="moren">默认</text>
-              </view>
-              <view class="">
-                {{v.fullAddress}}
-              </view>
-              <view class="">
-                {{v.address}}
-              </view>
-            </view>
-            <view class="address_edit">
-              <u-icon name="edit-pen"></u-icon>
-            </view>
-          </view>
-        </u-radio-group>
-      </u-swipe-action-item>
-    </u-swipe-action>
-
-    <u-empty mode="data" :icon="require('@/static/common/empty_data.png')" v-if="list.length < 1">
-    </u-empty>
-
-
-
-    <view class="" style="height: 100rpx;">
-
-    </view>
-    <view class="bottom-container">
-      <u-button @tap='addAddressFn' class="button" text="新增收货地址 " color="linear-gradient(to right, #7fdaff, #6da7ff)"
-        shape="circle">
-      </u-button>
-    </view>
-
-
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        // u-radio-group的v-model绑定的值如果设置为某个radio的name，就会被默认选中
-        options1: [{
-          text: '删除',
-          style: {
-            backgroundColor: '#f56c6c',
-          }
-        }],
-        radiovalue1: null,
-        list: []
-      };
-    },
-    onLoad({
-      id
-    }) {
-      this.id = id
-
-    },
-    onShow() {
-      this.getList()
-    },
-
-    methods: {
-
-      //radio切换事件
-      async changeFn(addressDeliveryId) {
-        await this.$api.post('/account/default-address', {
-          addressDeliveryId: addressDeliveryId
-        })
-        this.getList()
-      },
-      //删除
-      async deleteFn(addressDeliveryId) {
-        let params = {
-          addressDeliveryId: addressDeliveryId
-        }
-        await this.$api.post('/account/delete-address', params)
-        this.getList()
-      },
-      //获取地址数据
-      async getList() {
-        let {
-          data
-        } = await this.$api.get('/account/address-list')
-        this.list = data
-        for (let i = 0; i < data.length; i++) {
-          if (data[i].defaultFlag) {
-            this.radiovalue1 = i
-          }
-        }
-      },
-      //编辑地址
-      toEditAddress(addressDeliveryId) {
-        uni.navigateTo({
-          url: `/pages/profile/shop/editAddress?addressDeliveryId=${addressDeliveryId}`
-        })
-      },
-      //添加地址
-      addAddressFn() {
-        uni.navigateTo({
-          url: '/pages/profile/shop/addAddress'
-        })
-      }
-
-    }
-  };
-</script>
-
-<style lang="scss" scoped>
-  .app-container {
-    padding: 20rpx 30rpx;
-
-    .address {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      border-radius: 20rpx;
-      background-color: #fff;
-      padding: 20rpx;
-      font-size: 28rpx;
-      line-height: 40rpx;
-      margin-bottom: 20rpx;
-    }
-  }
-
-  .address_center {
-    padding-left: 20rpx;
-    flex: 1;
-  }
-
-
-  .bottom-container {
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    background: #FFFFFF;
-    padding: 10rpx 30rpx;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-  }
-
-  .moren {
-    display: inline-block;
-    background-color: #ffd9d9;
-    color: #ff5656;
-    font-size: 28rpx;
-    margin-left: 6rpx;
-  }
-</style>

src/pages/profile/special/index.vue

@@ -1,116 +0,0 @@
-<template>
-  <view class="app-container">
-    <view class="user-list-container">
-      <view class="item" v-for="(item, index) in dataList" :key="index" @tap="toDetail(item)">
-        <view @tap.stop>
-          <u--image class="img" :showLoading="true" :src="$imageUrl + item.imageUrl" width="160rpx" height="160rpx">
-          </u--image>
-        </view>
-        <view class="main">
-          <view class="top">
-            <view class="name ellipsis">{{item.projectDisciplineName}}</view>
-            <view class="row">品牌：{{item.brandName}}</view>
-            <view class="row">分类：{{item.categoryName}}</view>
-          </view>
-          <view class="bottom">
-            <view class="date">{{item.updateTime}}</view>
-            <view class="status">{{item.status | statusFilter}}</view>
-          </view>
-        </view>
-      </view>
-    </view>
-    <u-empty mode="data" :icon="require('@/static/common/empty_data.png')"
-      v-if="loadStatus == 'nomore' && dataList.length < 1">
-    </u-empty>
-    <u-loadmore :status="loadStatus" v-else />
-  </view>
-</template>
-
-<script>
-  export default {
-    filters: {
-      statusFilter(val) {
-        const MAP = {
-          1: '未开始',
-          2: '学习中',
-          3: '已完成',
-        }
-        return MAP[val]
-      }
-    },
-    data() {
-      return {
-        dataList: [],
-        pageNum: 1,
-        loadStatus: 'loadmore', // 加载前=loadmore，加载中=loading，没有数据=nomore
-      }
-    },
-
-    onLoad() {
-      this.getList();
-    },
-
-    // 下拉刷新
-    onPullDownRefresh() {
-      this.pageNum = 1;
-      this.getList();
-    },
-
-    // 上拉加载
-    onReachBottom() {
-      this.getList(1);
-    },
-
-    methods: {
-      // 获取列表
-      getList(loadMore) {
-        if (this.loadStatus == 'nomore' && loadMore) return;
-        this.loadStatus = 'loadmore';
-        if (!loadMore) {
-          this.pageNum = 1;
-        } else {
-          this.loadStatus = 'loading';
-        }
-        this.$api.post('/personal/project-discipline', {
-          pageNum: this.pageNum,
-          pageSize: 10,
-          chooseFlag: 0,
-          status: 0,
-          accountCode: this.$store.getters.usercode,
-        }).then(res => {
-          let _list = res.data.records;
-          let pageTotal = res.data.pages;
-          if (this.pageNum >= pageTotal) {
-            this.loadStatus = 'nomore';
-          }
-          if (_list.length) {
-          	 this.pageNum += 1;
-          }
-          if (loadMore) {
-            this.dataList = this.dataList.concat(_list);
-            this.loadStatus = 'loadmore';
-          } else {
-            this.dataList = _list;
-          }
-        }).catch(res => {
-          this.loadStatus = 'nomore';
-        }).finally(res => {
-          uni.stopPullDownRefresh();
-        })
-      },
-
-      // 进入详情
-      toDetail(item) {
-        uni.navigateTo({
-          url: `pages/learn/components/specialDetail?projectDisciplineId=${item.projectDisciplineId}`
-        });
-      },
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  .app-container {
-    padding-bottom: 1rpx;
-  }
-</style>

src/pages/profile/study/index.vue

@@ -1,183 +0,0 @@
-<template>
-  <view class="app-container">
-    <u-sticky bgColor="#fff">
-      <view class="search-container">
-        <u--input
-          placeholder="请输入关键词搜索"
-          prefixIcon="search"
-          prefixIconStyle="font-size: 22px; color: #909399;"
-          shape="circle"
-          v-model="keyword"
-        >
-        </u--input>
-        <u-button
-          class="button"
-          @tap="searchData"
-          text="搜索"
-          type="primary"
-          size="normal"
-          shape="circle"
-        ></u-button>
-      </view>
-    </u-sticky>
-
-    <view class="list-container">
-      <view
-        class="item"
-        v-for="(item, index) in dataList"
-        :key="index"
-        @tap.stop="toDetail(item.disciplineId)">
-        <view class="image">
-          <u--image class="img" :showLoading="true" :src="$imageUrl + item.imageUrl" width="690rpx" height="300rpx"></u--image>
-          <view class="status">{{item.study | statusFilter}}</view>
-        </view>
-        <view class="main">
-          <view class="name ellipsis-2">{{item.disciplineName}}</view>
-          <view class="date">{{item.status == 1 ? '推送':'上次学习'}}时间：{{item.updateTime}}</view>
-        </view>
-      </view>
-    </view>
-
-  </view>
-</template>
-
-<script>
-export default {
-  filters: {
-    statusFilter(val) {
-      const MAP = {
-        true: '学习中',
-        false: '未开始',
-      }
-      return MAP[val];
-    }
-  },
-
-  data() {
-    return {
-      keyword: '',
-      dataList: [],
-      pageNum: 1,
-      loadStatus: 'loadmore', // 加载前=loadmore，加载中=loading，没有数据=nomore
-    }
-  },
-
-  onLoad() {
-    this.getList();
-  },
-
-  // 下拉刷新
-  onPullDownRefresh() {
-    this.pageNum = 1;
-    this.getList();
-  },
-
-  // 上拉加载
-  onReachBottom() {
-    this.getList(1);
-  },
-
-  methods: {
-    // 获取列表
-    getList(loadMore) {
-      if(this.loadStatus == 'nomore' && loadMore)return;
-      this.loadStatus = 'loadmore';
-      if(!loadMore){
-      	this.pageNum = 1;
-      }else{
-      	this.loadStatus = 'loading';
-      }
-      this.$api.post('/personal/user-study', {
-        pageNum: this.pageNum,
-        pageSize: 10,
-        accountCode: this.$store.getters.usercode,
-        entryName: this.keyword,
-      }).then(res => {
-        let _list = res.data.records;
-        let pageTotal = res.data.pages;
-        if(this.pageNum >= pageTotal){
-        	this.loadStatus = 'nomore';
-        }
-        if (_list.length) {
-        	this.pageNum += 1;
-        }
-        if (loadMore) {
-        	this.dataList = this.dataList.concat(_list);
-        	this.loadStatus = 'loadmore';
-        } else {
-        	this.dataList = _list;
-        }
-      }).catch(res => {
-        this.loadStatus = 'nomore';
-      }).finally(res => {
-        uni.stopPullDownRefresh();
-      })
-    },
-
-    // 搜索
-    searchData() {
-      this.pageNum = 1;
-      this.getList();
-    },
-
-    // 进入详情
-    toDetail(id) {
-      uni.navigateTo({
-        url: `pages/learn/components/learnDetail?disciplineId=${id}`
-      });
-    },
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.app-container {
-  padding-bottom: 1px;
-  background: #ffffff;
-}
-
-.search-container {
-  padding: 12rpx 30rpx;
-  position: relative;
-  .button {
-    position: absolute;
-    right: 30rpx;
-    top: 12rpx;
-    width: 140rpx;
-    height: calc(100% - 24rpx);
-  }
-}
-
-.list-container {
-  padding: 20rpx 30rpx 0;
-  .item {
-    margin-bottom: 30rpx;
-    .image {
-      position: relative;
-      .status {
-        position: absolute;
-        top: 0;
-        left: 20rpx;
-        padding: 10rpx 20rpx;
-        background: var(--assist-color);
-        font-size: 24rpx;
-        color: #ffffff;
-        border-radius: 0 0 10rpx 10rpx;
-      }
-    }
-    .main {
-      .name {
-        font-size: 30rpx;
-        color: #333333;
-        font-weight: 500;
-        margin-top: 10rpx;
-      }
-      .date {
-        font-size: 28rpx;
-        color: #666666;
-        margin-top: 10rpx;
-      }
-    }
-  }
-}
-</style>

src/pages/wiki/components/faultcode.vue

@@ -1,192 +0,0 @@
-<template>
-  <view>
-    <u-sticky bgColor="#fff" style='padding: 0 30rpx;'>
-      <u-tabs @click='changeFn' keyName='categoryName' :current='tabsIndex' :list="columnSort" lineWidth='40'></u-tabs>
-      <view style="padding: 20rpx 0;">
-        <u-search @search='searchFn' @custom='searchFn' bgColor='#f2f2f2' clearabled show-action shape="square"
-          placeholder="搜索" v-model="entryName">
-        </u-search>
-      </view>
-    </u-sticky>
-    <!-- 列表 -->
-    <view @click="showPopup(v)" class="list" v-for="(v,i) in dataList" :key="i">
-      <view class="">
-        产品品牌： {{v.brandName}}
-      </view>
-      <view class="">
-        显示代码： {{v.faultCode}}
-      </view>
-      <view class="">
-        适用产品： {{v.categoryName}}
-      </view>
-      <view class="">
-        故障原因： {{v.faultWhy}}
-      </view>
-      <view class="">
-        备注内容： {{v.remark}}
-      </view>
-    </view>
-    <view v-show="showEmpty" class="" style="width: 100%; height: 100%;display: flex;justify-content: center;">
-      <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png">
-      </u-empty>
-    </view>
-
-    <!-- 弹出层 -->
-    <u-popup :round="10" :show="show" @close="close">
-      <view>
-        <view class="popup">
-          <u-cell-group>
-            <u-cell title="试题列表">
-              <text @click="close" slot="value">X</text>
-            </u-cell>
-          </u-cell-group>
-        </view>
-        <view class="detail">
-          <view class="">
-            产品品牌： {{detailData.brandName}}
-          </view>
-          <view class="">
-            显示代码： {{detailData.faultCode}}
-          </view>
-          <view class="">
-            适用产品： {{detailData.categoryName}}
-          </view>
-          <view class="">
-            产品机号： {{detailData.productCode}}
-          </view>
-          <view class="">
-            故障原因： {{detailData.faultWhy}}
-          </view>
-          <view class="">
-            备注内容： {{detailData.remark}}
-          </view>
-          <view class="">
-            解除条件： {{detailData.removeConditions}}
-          </view>
-        </view>
-        <view style="margin: 40rpx 0; ">
-          <u-button @click='show=false' shape='circle' style='width: 700rpx' type='primary' text="我已知晓"></u-button>
-        </view>
-      </view>
-    </u-popup>
-
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        pageNum: 1,
-        columnId: '',
-        entryName: '',
-        productCategoryId: '',
-        keyword: '',
-        dataList: [],
-        columnSort: [],
-        show: false,
-        showEmpty: false,
-        detailData: {},
-        tabsIndex: ''
-
-      };
-    },
-    async onPullDownRefresh() {
-      this.pageNum = 1
-      let res = await this.getData()
-      this.dataList = res
-      uni.stopPullDownRefresh()
-    },
-    async onReachBottom() {
-      this.pageNum++
-      await this.getData()
-    },
-    async onLoad(options) {
-      this.columnId = options.columnId
-      this.productCategoryId = options.productCategoryId
-      await this.getData()
-      await this.getColumnSorting()
-      this.columnSort.forEach((v, i) => {
-        if (v.productCategoryId === options.productCategoryId) {
-          this.tabsIndex = i
-        }
-      })
-    },
-    methods: {
-      //搜索
-      async searchFn() {
-        this.pageNum = 1
-        let res = await this.getData()
-        this.dataList = res
-      },
-      //分类
-      async changeFn(value) {
-        this.productCategoryId = value.productCategoryId
-        this.pageNum = 1
-        let res = await this.getData()
-        this.dataList = res
-      },
-      //获取分类数据
-      async getColumnSorting() {
-        let params = {
-          "brandCodes": [],
-          "columnId": this.columnId
-        }
-        let {
-          data
-        } = await this.$api.post('/homepage/columnsorting', params)
-        this.columnSort = data
-      },
-      //获取列表数据
-      async getData() {
-        let params = {
-          "columnId": this.columnId,
-          "entryName": this.entryName,
-          "pageNum": this.pageNum,
-          "pageSize": 10,
-          "productCategoryId": this.productCategoryId
-        }
-        let {
-          data
-        } = await this.$api.post('/homepage/fault-search', params)
-        if (data.records.length === 0) {
-          this.showEmpty = true
-        } else {
-          this.showEmpty = false
-        }
-        this.dataList = [...this.dataList, ...data.records]
-        return data.records
-      },
-      showPopup(value) {
-        this.show = true
-        console.log(value)
-        this.detailData = value
-      },
-      close() {
-        this.show = false
-      }
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  .list {
-    width: 634rpx;
-    height: 300rpx;
-    background: #ffffff;
-    border-radius: 20rpx;
-    margin: 30rpx;
-    overflow: auto;
-    padding: 24rpx 28rpx 0rpx 28rpx;
-    font-size: 28rpx;
-    line-height: 48rpx;
-  }
-
-  .detail {
-    padding: 20rpx 30rpx;
-    height: 750rpx;
-    overflow: auto;
-    font-size: 28rpx;
-    line-height: 52rpx;
-  }
-</style>

src/pages/wiki/components/instructions.vue

@@ -1,140 +0,0 @@
-<template>
-  <view class="">
-    <u-sticky bgColor="#fff" style='padding: 0 30rpx;'>
-      <u-tabs @click='changeFn' :list="columnSort" :current='tabsIndex' keyName='categoryName' lineWidth='40'></u-tabs>
-      <view style="padding: 20rpx 0;">
-        <u-search @search='searchFn' @custom='searchFn' bgColor='#f2f2f2' clearabled show-action shape="square"
-          placeholder="搜索" v-model="entryName">
-        </u-search>
-      </view>
-    </u-sticky>
-
-    <!-- 列表 -->
-    <view @click="toInstructionsDetail(v.instructionsId)" class="list" v-for="(v,i) in dataList">
-      <view class="">
-        标题： {{v.instructionsName}}
-      </view>
-      <view class="">
-        品牌： {{v.brandName}}
-      </view>
-      <view class="">
-        型号： {{v.productCode}}
-      </view>
-      <!--    <view class="">
-        机型名称： {{v.categoryName}}
-      </view> -->
-    </view>
-
-    <view v-show="showEmpty" class="" style="width: 100%; height: 100%;display: flex;justify-content: center;">
-      <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png">
-      </u-empty>
-    </view>
-
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        pageNum: 1,
-        columnId: '',
-        entryName: '',
-        productCategoryId: '',
-        keyword: '',
-        dataList: [],
-        columnSort: [],
-        showEmpty: false,
-        detailData: {},
-        tabsIndex: ''
-      };
-    },
-    async onPullDownRefresh() {
-      this.pageNum = 1
-      let res = await this.getData()
-      this.dataList = res
-      uni.stopPullDownRefresh()
-    },
-    async onReachBottom() {
-      this.pageNum++
-      await this.getData()
-    },
-    async onLoad(options) {
-      this.columnId = options.columnId
-      this.productCategoryId = options.productCategoryId
-      await this.getData()
-      await this.getColumnSorting()
-      this.columnSort.forEach((v, i) => {
-        if (v.productCategoryId === options.productCategoryId) {
-          this.tabsIndex = i
-        }
-      })
-    },
-    methods: {
-      //搜索
-      async searchFn() {
-        this.pageNum = 1
-        let res = await this.getData()
-        this.dataList = res
-      },
-      //分类
-      async changeFn(value) {
-        this.productCategoryId = value.productCategoryId
-        this.pageNum = 1
-        let res = await this.getData()
-        this.dataList = res
-      },
-      //获取分类数据
-      async getColumnSorting() {
-        let params = {
-          "brandCodes": [],
-          "columnId": this.columnId
-        }
-        let {
-          data
-        } = await this.$api.post('/homepage/columnsorting', params)
-        this.columnSort = data
-      },
-      //获取列表数据
-      async getData() {
-        let params = {
-          "columnId": this.columnId,
-          "entryName": this.entryName,
-          "pageNum": this.pageNum,
-          "pageSize": 10,
-          "productCategoryId": this.productCategoryId
-        }
-        let {
-          data
-        } = await this.$api.post('/homepage/instructions-search', params)
-        if (data.records.length === 0) {
-          this.showEmpty = true
-        } else {
-          this.showEmpty = false
-        }
-        this.dataList = [...this.dataList, ...data.records]
-        return data.records
-      },
-      // 说明书详情页面
-      toInstructionsDetail(instructionsId) {
-        uni.navigateTo({
-          url: `pages/wiki/components/instructionsDetail?instructionsId=${instructionsId}`
-        })
-      }
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  .list {
-    width: 634rpx;
-    height: 220rpx;
-    background: #ffffff;
-    border-radius: 20rpx;
-    margin: 30rpx;
-    overflow: auto;
-    padding: 24rpx 28rpx 0rpx 28rpx;
-    font-size: 28rpx;
-    line-height: 48rpx;
-  }
-</style>

src/pages/wiki/components/instructionsDetail.vue

@@ -1,86 +0,0 @@
-<template>
-  <view class="">
-    <view class="detail">
-      <u-cell-group>
-        <u-cell size='large' title="说明书内容"> </u-cell>
-      </u-cell-group>
-      <view class="detail_text">
-        <view class="" style="color: #333;">
-          {{dataList.instructionsName}}
-        </view>
-        <view class="">
-          品牌： {{dataList.brandName}}
-        </view>
-        <view class="">
-          型号： {{dataList.productCode}}
-        </view>
-        <!-- <view class="">
-          产品名称： 挂机空调
-        </view>
-        <view class="">
-          机型名称： KFR-26GW/(26545)FNhAa-B1(WIFI)
-        </view>
-        <view class="">
-          说明书：说明书名称展示
-        </view> -->
-        <view class="" style="overflow: hidden;">
-          <u-button @click='downFile' style='width: 20rpx;float: right;' icon='download' type="primary" size='mini'>
-          </u-button>
-        </view>
-      </view>
-    </view>
-    <zj-FileViewer ref="FileViewer" :fileList='dataList.imageUrl'></zj-FileViewer>
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        dataList: {}
-      }
-    },
-    onLoad(options) {
-      this.getData(options.instructionsId)
-    },
-    methods: {
-      //下载文件
-      downFile() {
-        console.log(this.$imageUrl + this.dataList.imageUrl[0].url)
-        window.open(this.$imageUrl + this.dataList.imageUrl[0].url)
-      },
-      //获取数据
-      async getData(instructionsId) {
-        let params = {
-          "accountCode": this.$store.getters.usercode,
-          "instructionsId": instructionsId,
-          "source": 1
-        }
-        let {
-          data
-        } = await this.$api.post('/instructions/detail', params)
-        this.dataList = data
-        await this.$refs.FileViewer.init();
-      }
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  .top {
-    width: 750rpx;
-    height: 350rpx;
-    background-color: #aaffff;
-  }
-
-  .detail {
-    background-color: #fff;
-
-    .detail_text {
-      font-size: 28rpx;
-      color: #666;
-      line-height: 48rpx;
-      padding: 30rpx;
-    }
-  }
-</style>

src/pages/wiki/components/scripts.vue

@@ -1,197 +0,0 @@
-<template>
-  <view class="">
-
-    <u-sticky bgColor="#fff" style='padding: 0 30rpx;'>
-      <u-tabs @click='changeFn' :list="columnSort" keyName='categoryName' :current='tabsIndex' lineWidth='40'></u-tabs>
-      <view style="padding: 20rpx 0;">
-        <u-search @search='searchFn' @custom='searchFn' bgColor='#f2f2f2' clearabled show-action shape="square"
-          placeholder="搜索" v-model="entryName">
-        </u-search>
-      </view>
-    </u-sticky>
-
-    <!-- 列表 -->
-    <view @click="showPopup(v)" class="list" v-for="(v,i) in dataList" :key="i">
-      <view class="list_title">
-        品牌：{{v.brandName}}
-      </view>
-      <view class="list_title">
-        {{v.wordsTechniqueName}}
-      </view>
-      <view class="list_answer">
-        <u--text size='12' :lines="5" color='color: #666;' :text="`答案：${v.wordsTechniqueOverview}`">
-        </u--text>
-
-      </view>
-    </view>
-    <view v-show="showEmpty" class="" style="width: 100%; height: 100%;display: flex;justify-content: center;">
-      <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png">
-      </u-empty>
-    </view>
-    <!-- 弹出层 -->
-    <u-popup :round="10" :show="show" @close="close">
-      <view>
-        <view class="popup">
-          <u-cell-group>
-            <u-cell title="产品话术">
-              <text @click="close" slot="value">X</text>
-            </u-cell>
-          </u-cell-group>
-        </view>
-        <view class="detail">
-          <view class="">
-            品牌：{{detailData.brandName}}
-          </view>
-          <view class="">
-            产品类别：{{detailData.categoryName}}
-          </view>
-          <view class="">
-            关键字词：{{detailData.entryName}}
-          </view>
-          <view class="">
-            问题：{{detailData.wordsTechniqueName}}
-          </view>
-          <view class="">
-            答案：{{detailData.wordsTechniqueOverview}}
-          </view>
-        </view>
-        <view style="margin: 40rpx 0;">
-          <u-button shape='circle' style='width: 700rpx' type='primary' text="我已知晓"></u-button>
-        </view>
-      </view>
-    </u-popup>
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        pageNum: 1,
-        columnId: '',
-        entryName: '',
-        productCategoryId: '',
-        keyword: '',
-        dataList: [],
-        columnSort: [],
-        showEmpty: false,
-        detailData: {},
-        keyword: '',
-        show: false,
-        tabsIndex: ''
-
-      }
-    },
-    async onPullDownRefresh() {
-      this.pageNum = 1
-      let res = await this.getData()
-      this.dataList = res
-      uni.stopPullDownRefresh()
-    },
-    async onReachBottom() {
-      this.pageNum++
-      await this.getData()
-    },
-    async onLoad(options) {
-      this.columnId = options.columnId
-      this.productCategoryId = options.productCategoryId
-      await this.getData()
-      await this.getColumnSorting()
-      this.columnSort.forEach((v, i) => {
-        if (v.productCategoryId === options.productCategoryId) {
-          this.tabsIndex = i
-        }
-      })
-    },
-    methods: {
-      //搜索
-      async searchFn() {
-        this.pageNum = 1
-        let res = await this.getData()
-        this.dataList = res
-      },
-      //分类
-      async changeFn(value) {
-        this.productCategoryId = value.productCategoryId
-        this.pageNum = 1
-        let res = await this.getData()
-        this.dataList = res
-      },
-      //获取分类数据
-      async getColumnSorting() {
-        let params = {
-          "brandCodes": [],
-          "columnId": this.columnId
-        }
-        let {
-          data
-        } = await this.$api.post('/homepage/columnsorting', params)
-        this.columnSort = data
-      },
-      //获取列表数据
-      async getData() {
-        let params = {
-          "columnId": this.columnId,
-          "entryName": this.entryName,
-          "pageNum": this.pageNum,
-          "pageSize": 10,
-          "productCategoryId": this.productCategoryId
-        }
-        let {
-          data
-        } = await this.$api.post('/homepage/words-search', params)
-        if (data.records.length === 0) {
-          this.showEmpty = true
-        } else {
-          this.showEmpty = false
-        }
-        this.dataList = [...this.dataList, ...data.records]
-        return data.records
-      },
-      showPopup(value) {
-        this.detailData = value
-        this.show = true
-      },
-      close() {
-        this.show = false
-      }
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  .content {}
-
-  .list {
-    width: 634rpx;
-    height: 300rpx;
-    background: #ffffff;
-    border-radius: 20rpx;
-    margin: 30rpx;
-    overflow: auto;
-    padding: 24rpx 28rpx 0rpx 28rpx;
-    // overflow: hidden;
-
-    .list_title {
-      font-size: 28rpx;
-      color: #333;
-      line-height: 48rpx;
-    }
-
-    .list_answer {
-      font-size: 24rpx;
-      color: #666;
-      line-height: 36rpx;
-    }
-  }
-
-  .popup {}
-
-  .detail {
-    padding: 20rpx 30rpx;
-    height: 600rpx;
-    overflow: auto;
-    font-size: 28rpx;
-    line-height: 52rpx;
-  }
-</style>

src/pages/wiki/components/train.vue

@@ -1,156 +0,0 @@
-<template>
-  <view class="">
-    <u-sticky bgColor="#fff" style='padding: 0 30rpx;'>
-      <u-tabs @click='changeFn' keyName='categoryName' :current='tabsIndex' :list="columnSort" lineWidth='40'
-        :scrollable='true'>
-      </u-tabs>
-      <view style="padding: 20rpx 0;">
-        <u-search @search='searchFn' @custom='searchFn' bgColor='#f2f2f2' clearabled show-action shape="square"
-          placeholder="搜索" v-model="entryName">
-        </u-search>
-      </view>
-    </u-sticky>
-    <br>
-    <view @click="toCurriculumFn(v.disciplineId)" class="list" v-for="(v,i) in dataList" :key="i">
-      <view class="list_left">
-        <image :src="$imageUrl + v.imageUrl" style="width: 100%;height: 100%;" mode=""></image>
-      </view>
-      <view class="list_right">
-        <view class="" style="font-size: 28rpx;">
-          {{v.disciplineName}}
-        </view>
-        <view class="">
-          产品品牌：{{v.brandName}}
-        </view>
-        <view class="">
-          {{v.disciplineOverview}}
-        </view>
-        <view class="" style="color: #999;">
-          2022-11-01
-        </view>
-      </view>
-
-    </view>
-    <view v-show="showEmpty" class="" style="width: 100%; height: 100%;display: flex;justify-content: center;">
-      <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png">
-      </u-empty>
-    </view>
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        showEmpty: false,
-        columnSort: [],
-        options: {},
-        pageNum: 1,
-        dataList: [],
-        entryName: '',
-        productCategoryId: '',
-        tabsIndex: '',
-
-      };
-    },
-    async onPullDownRefresh() {
-      this.pageNum = 1
-      let res = await this.getData(this.options)
-      this.dataList = res
-      uni.stopPullDownRefresh()
-    },
-    async onReachBottom() {
-      this.pageNum++
-      await this.getData(this.options)
-    },
-    async onLoad(options) {
-      this.options = options
-      this.productCategoryId = options.productCategoryId
-      await this.getData(options)
-      await this.getColumnSorting()
-      this.columnSort.forEach((v, i) => {
-        if (v.productCategoryId === options.productCategoryId) {
-          this.tabsIndex = i
-        }
-      })
-    },
-    methods: {
-      //跳转课程详情
-      toCurriculumFn(disciplineId) {
-        uni.navigateTo({
-          url: `pages/learn/components/learnDetail?disciplineId=${disciplineId}`
-        })
-      },
-      //搜索
-      async searchFn() {
-        this.pageNum = 1
-        let res = await this.getData(this.options)
-        this.dataList = res
-      },
-      //分类
-      async changeFn(value) {
-        this.productCategoryId = value.productCategoryId
-        this.pageNum = 1
-        let res = await this.getData(this.options)
-        this.dataList = res
-      },
-      //获取分类数据
-      async getColumnSorting() {
-        let params = {
-          "brandCodes": [],
-          "columnId": this.options.columnId
-        }
-        let {
-          data
-        } = await this.$api.post('/homepage/columnsorting', params)
-        this.columnSort = data
-      },
-      //获取列表数据
-      async getData(options) {
-        let params = {
-          "columnId": options.columnId,
-          "pageNum": this.pageNum,
-          "pageSize": 10,
-          "productCategoryId": this.productCategoryId,
-          "entryName": this.entryName
-        }
-        let {
-          data
-        } = await this.$api.post('/homepage/disciplines-search', params)
-        if (data.records.length === 0) {
-          this.showEmpty = true
-        } else {
-          this.showEmpty = false
-        }
-        this.dataList = [...this.dataList, ...data.records]
-        return data.records
-      }
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  .list {
-    display: flex;
-    justify-content: space-between;
-    margin: 0 30rpx 20rpx;
-    padding: 30rpx;
-    background: #ffffff;
-    border-radius: 20rpx;
-
-
-    .list_left {
-      width: 140rpx;
-
-    }
-
-    .list_right {
-      padding-left: 18rpx;
-      flex: 1;
-      font-size: 24rpx;
-      color: #333;
-      line-height: 36rpx;
-      // background-color: #ffff7f;
-    }
-  }
-</style>

src/pages/wiki/components/video.vue

@@ -1,156 +0,0 @@
-<template>
-  <view class="">
-    <u-sticky bgColor="#fff" style='padding: 0 30rpx;'>
-      <u-tabs @click='changeFn' :current='tabsIndex' :list="columnSort" keyName='categoryName' lineWidth=' 40'>
-      </u-tabs>
-      <view style="padding: 20rpx 0;">
-        <u-search @search='searchFn' @custom='searchFn' bgColor='#f2f2f2' clearabled show-action shape="square"
-          placeholder="搜索" v-model="entryName">
-        </u-search>
-      </view>
-    </u-sticky>
-    <br>
-
-    <view @click="toCurriculumFn(v.disciplineId)" class="list" v-for="(v,i) in dataList">
-      <view class="list_left">
-        <image :src="$imageUrl + v.imageUrl" style="width: 100%;height: 100%;" mode=""></image>
-      </view>
-      <view class="list_right">
-        <view class="" style="font-size: 28rpx;">
-          {{v.disciplineName}}
-        </view>
-        <view class="">
-          产品品牌：{{v.brandName}}
-        </view>
-        <view class="">
-          {{v.disciplineOverview}}
-        </view>
-        <view class="" style="color: #999;">
-          {{v.updateTime}}
-        </view>
-      </view>
-
-    </view>
-    <view v-show="showEmpty" class="" style="width: 100%; height: 100%;display: flex;justify-content: center;">
-      <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png">
-      </u-empty>
-    </view>
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        pageNum: 1,
-        columnId: '',
-        entryName: '',
-        productCategoryId: '',
-        keyword: '',
-        dataList: [],
-        columnSort: [],
-        showEmpty: false,
-        tabsIndex: ''
-      };
-    },
-    async onPullDownRefresh() {
-      this.pageNum = 1
-      let res = await this.getData()
-      this.dataList = res
-      uni.stopPullDownRefresh()
-    },
-    async onReachBottom() {
-      this.pageNum++
-      await this.getData()
-    },
-    async onLoad(options) {
-      this.columnId = options.columnId
-      this.productCategoryId = options.productCategoryId
-      await this.getData()
-      await this.getColumnSorting()
-      this.columnSort.forEach((v, i) => {
-        if (v.productCategoryId === options.productCategoryId) {
-          this.tabsIndex = i
-        }
-      })
-    },
-    methods: {
-      //跳转课程详情
-      toCurriculumFn(disciplineId) {
-        uni.navigateTo({
-          url: `pages/learn/components/learnDetail?disciplineId=${disciplineId}`
-        })
-      },
-      //搜索
-      async searchFn() {
-        this.pageNum = 1
-        let res = await this.getData()
-        this.dataList = res
-      },
-      //分类
-      async changeFn(value) {
-        this.productCategoryId = value.productCategoryId
-        this.pageNum = 1
-        let res = await this.getData()
-        this.dataList = res
-      },
-      //获取分类数据
-      async getColumnSorting() {
-        let params = {
-          "brandCodes": [],
-          "columnId": this.columnId
-        }
-        let {
-          data
-        } = await this.$api.post('/homepage/columnsorting', params)
-        this.columnSort = data
-      },
-      //获取列表数据
-      async getData() {
-        let params = {
-          "columnId": this.columnId,
-          "entryName": this.entryName,
-          "pageNum": this.pageNum,
-          "pageSize": 10,
-          "productCategoryId": this.productCategoryId
-        }
-        let {
-          data
-        } = await this.$api.post('/homepage/video-search', params)
-        if (data.records.length === 0) {
-          this.showEmpty = true
-        } else {
-          this.showEmpty = false
-        }
-        this.dataList = [...this.dataList, ...data.records]
-        return data.records
-      },
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  .list {
-    display: flex;
-    justify-content: space-between;
-    margin: 0 30rpx 20rpx;
-    padding: 30rpx;
-    background: #ffffff;
-    border-radius: 20rpx;
-
-
-    .list_left {
-      width: 140rpx;
-
-    }
-
-    .list_right {
-      padding-left: 18rpx;
-      flex: 1;
-      font-size: 24rpx;
-      color: #333;
-      line-height: 36rpx;
-      // background-color: #ffff7f;
-    }
-  }
-</style>

src/pages/wiki/index.vue

@@ -1,364 +0,0 @@
-<!-- 百科知识 -->
-<template>
-  <view class="">
-    <!--  <view class="search">
-      <u-search @search='searchFn' @custom='searchFn' margin="0 0 10rpx 0" clearabled show-action shape="square"
-        placeholder="搜索" v-model="entryName">
-      </u-search>
-    </view> -->
-    <view class="data">
-      <view class="data_left">
-        <u-button @click='columnFn(v.columnId)' v-for="(v,i) in dataList" :key="i"
-          :class=' v.columnId === activeIndex ? "" : "unactive"' style='width: 160rpx;' shape="circle" type="primary"
-          size='mini' :text="v.columnName">
-        </u-button>
-      </view>
-      <view class="data_right">
-
-        <view @click="toPageFn(v)" v-for="(v,i) in columnSort" :key="i" class="list">
-          <image src="@/static/user/other_speech.png" style="width: 140rpx;height: 140rpx" mode=""></image>
-          <view class="list_text" style="width: 140rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
-            {{v.categoryName}}
-          </view>
-        </view>
-
-        <!-- 百科，视频课程 -->
-        <!-- <view @click="toTrainFn" v-if="activeIndex === '0' || activeIndex === '1'" v-for="(v,i) in disciplineList"
-          :key="v.disciplineId" class="list">
-          <image :src="$imageUrl + v.imageUrl" style="width: 140rpx;height: 140rpx" mode=""></image>
-          <view class="list_text" style="width: 140rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
-            {{v.disciplineName}}
-          </view>
-        </view> -->
-        <!-- 故障代码 -->
-        <!-- <view @click="toFaultcodeFn" v-if="activeIndex === '2'" v-for="(val) in faultList" :key="val.faultId"
-          class="list">
-          <image src="@/static/user/other_fault.png" style="width: 140rpx;height: 140rpx" mode=""></image>
-          <view class="list_text" style="width: 140rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
-            {{val.faultWhy}}
-          </view>
-        </view> -->
-        <!-- 说明书 -->
-        <!--  <view @click="toInstructionsFn" v-if="activeIndex === '3'" v-for="(val) in instructionsList"
-          :key="val.instructionsId" class="list">
-          <image src="@/static/user/other_book.png" style="width: 140rpx;height: 140rpx" mode=""></image>
-          <view class="list_text" style="width: 140rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
-            {{val.instructionsName}}
-          </view>
-        </view> -->
-        <!-- 话术 -->
-        <!-- <view @click="toScriptsFn" v-if="activeIndex === '4'" v-for="(val) in techniqueList" :key="val.wordsTechniqueId"
-          class="list">
-          <image src="@/static/user/other_speech.png" style="width: 140rpx;height: 140rpx" mode=""></image>
-          <view class="list_text" style="width: 140rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
-            {{val.wordsTechniqueName}}
-          </view>
-        </view> -->
-        <!-- <view @click="toScriptsFn" class="list">
-          <image src="../../static/logo.png" style="width: 140rpx;height: 140rpx" mode=""></image>
-          <view class="list_text">产品话术</view>
-        </view>
-        <view @click="toFaultcodeFn" class="list">
-          <image src="../../static/logo.png" style="width: 140rpx;height: 140rpx" mode=""></image>
-          <view class="list_text">故障代码</view>
-        </view>
-        <view @click="toInstructionsFn" class="list">
-          <image src="../../static/logo.png" style="width: 140rpx;height: 140rpx" mode=""></image>
-          <view class="list_text">说明书</view>
-        </view>
-        <view @click="toTrainFn" class="list">
-          <image src="../../static/logo.png" style="width: 140rpx;height: 140rpx" mode=""></image>
-          <view class="list_text">培训资料</view>
-        </view>
-        <view @click="toVideoFn" class="list">
-          <image src="../../static/logo.png" style="width: 140rpx;height: 140rpx" mode=""></image>
-          <view class="list_text">视频资料</view>
-        </view> -->
-        <view v-show="showEmpty" class="" style="width: 100%; height: 100%;display: flex;justify-content: center;">
-          <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png">
-          </u-empty>
-        </view>
-
-      </view>
-
-    </view>
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        entryName: '',
-        keyword: '',
-        dataList: [],
-        activeIndex: '0',
-        columnSort: [],
-        // disciplineList: [], //百科，视频课程
-        // faultList: [], //故障代码
-        // instructionsList: [],
-        // techniqueList: [],
-        showEmpty: false
-      }
-    },
-    onLoad() {
-      this.getData()
-      // this.getDiscipline()
-      this.getColumnSorting()
-    },
-    methods: {
-      //跳转页面
-      toPageFn(value) {
-        let URL = ''
-        if (this.activeIndex === '0') {
-          URL = 'pages/wiki/components/train'
-        } else if (this.activeIndex === '1') {
-          URL = 'pages/wiki/components/video'
-        } else if (this.activeIndex === '2') {
-          URL = 'pages/wiki/components/faultcode'
-        } else if (this.activeIndex === '3') {
-          URL = 'pages/wiki/components/instructions'
-        } else {
-          URL = 'pages/wiki/components/scripts'
-        }
-        uni.navigateTo({
-          url: `${URL}?productCategoryId=${value.productCategoryId}&columnId=${this.activeIndex}`
-        })
-      },
-      //搜索
-      searchFn() {
-        this.columnFn(this.activeIndex)
-      },
-      //获取对应栏目下的数据-百科，视频课程
-      // async getTechnique() {
-      //   let params = {
-      //     disciplineType: "",
-      //     entryName: this.entryName,
-      //     pageNum: 1,
-      //     pageSize: -1,
-      //     source: 1,
-      //   }
-      //   let {
-      //     data
-      //   } = await this.$api.post('/words-technique/get-all', params)
-      //   if (data.records.length === 0) {
-      //     this.showEmpty = true
-      //   } else {
-      //     this.showEmpty = false
-      //   }
-      //   this.techniqueList = data.records
-      // },
-      //获取对应栏目下的数据-说明书
-      // async getInstructions() {
-      //   let params = {
-      //     "brandCode": [],
-      //     "brandName": "",
-      //     entryName: this.entryName,
-      //     "instructionsName": "",
-      //     "pageNum": 1,
-      //     "pageSize": -1,
-      //     "productCode": "",
-      //     "source": 1
-      //   }
-      //   let {
-      //     data
-      //   } = await this.$api.post('/instructions/get-all', params)
-      //   if (data.records.length === 0) {
-      //     this.showEmpty = true
-      //   } else {
-      //     this.showEmpty = false
-      //   }
-      //   this.instructionsList = data.records
-      // },
-      //获取对应栏目下的数据-故障代码
-      // async getFault() {
-      //   let params = {
-      //     "brandCode": [],
-      //     entryName: this.entryName,
-      //     "faultCode": "",
-      //     "faultWhy": "",
-      //     "pageNum": 1,
-      //     "pageSize": -1,
-      //     "productCategoryId": "",
-      //     "source": 0
-      //   }
-      //   let {
-      //     data
-      //   } = await this.$api.post('/fault/get-all', params)
-      //   if (data.records.length === 0) {
-      //     this.showEmpty = true
-      //   } else {
-      //     this.showEmpty = false
-      //   }
-      //   this.faultList = data.records
-      // },
-      //获取对应栏目下的数据-百科，视频课程
-      // async getDiscipline() {
-      //   let params = {
-      //     "disciplineType": this.activeIndex,
-      //     entryName: this.entryName,
-      //     "pageNum": 1,
-      //     "pageSize": -1,
-      //     "source": 1
-      //   }
-      //   let {
-      //     data
-      //   } = await this.$api.post('/discipline/get-all', params)
-      //   if (data.records.length === 0) {
-      //     this.showEmpty = true
-      //   } else {
-      //     this.showEmpty = false
-      //   }
-      //   this.disciplineList = data.records
-      // },
-      //获取栏目下内容分类
-      async getColumnSorting() {
-        let params = {
-          "brandCodes": [],
-          "columnId": this.activeIndex
-        }
-        let {
-          data
-        } = await this.$api.post('/homepage/columnsorting', params)
-        if (data.length === 0) {
-          this.showEmpty = true
-        } else {
-          this.showEmpty = false
-        }
-        // console.log(data)
-        this.columnSort = data
-      },
-      //动态添加样式-按钮
-      async columnFn(index) {
-        this.activeIndex = index
-
-
-        await this.getColumnSorting()
-
-        // if (index === '0' || index === '1') {
-        //   await this.getDiscipline()
-        // } else if (index === '2') {
-        //   await this.getFault()
-        // } else if (index === '3') {
-        //   await this.getInstructions()
-        // } else {
-        //   await this.getTechnique()
-        // }
-      },
-      //获取栏目数据
-      async getData() {
-        let {
-          data
-        } = await this.$api.get('/homepage/getcolumnsorting')
-        console.log(data)
-        this.dataList = data
-      },
-      //视频资料页面
-      toVideoFn() {
-        this.$Router.push({
-          name: 'video'
-        })
-      },
-      //培训资料页面
-      toTrainFn() {
-        this.$Router.push({
-          name: 'train'
-        })
-      },
-      //说明书页面
-      toInstructionsFn() {
-        this.$Router.push({
-          name: 'instructions'
-        })
-      },
-      //故障代码页面
-      toFaultcodeFn() {
-        this.$Router.push({
-          name: 'faultcode'
-        })
-      },
-      //产品话术页面
-      toScriptsFn() {
-        this.$Router.push({
-          name: 'scripts'
-        })
-      }
-    }
-
-  }
-</script>
-
-<style lang="scss" scoped>
-  .search {
-    background-color: #fff;
-    height: 80rpx;
-    padding: 0 30rpx 10rpx;
-  }
-
-  .data {
-    display: flex;
-    justify-content: space-around;
-    overflow: auto;
-    height: calc(100vh - 95px);
-
-    .data_left {
-      width: 220rpx;
-
-      background-color: #fff;
-      display: flex;
-      flex-wrap: wrap;
-      justify-content: center;
-      justify-items: center;
-      align-content: flex-start;
-
-      // flex-direction: column;
-      // align-items: center;
-
-      overflow: auto;
-
-      uni-button {
-        margin: 14rpx 0;
-
-      }
-    }
-
-    .data_right {
-      margin: 20rpx;
-      padding: 20rpx 0;
-      border-radius: 20rpx;
-      flex: 1;
-      background-color: #fff;
-      display: flex;
-      // justify-content: space-between;
-      justify-items: center;
-      align-content: flex-start;
-      flex-wrap: wrap;
-      overflow: auto;
-
-
-      .list {
-        margin: 10rpx;
-
-        .list_text {
-          font-size: 26rpx;
-          text-align: center;
-          padding-top: 20rpx;
-        }
-      }
-    }
-  }
-
-  .active {
-    color: #fff;
-    background-color: #3c9cff;
-    border-color: #3c9cff;
-    border-width: 1px;
-    border-style: solid;
-  }
-
-  .unactive {
-    background-color: #fff;
-    color: #000000;
-    border-style: none;
-  }
-</style>

src/router/index.js

@@ -34,7 +34,7 @@ router.beforeEach((to, from, next) => {
   } else {
     if (
       // 这些页面不需要验证登录
-      to.path == '/pages/login/index' || '/pages/login/indexs'
+      to.path == '/pages/login/index' || '/pages/login/indexs' || '/pages/index/index'
     ) {
       next();
     } else {

src/store/modules/exam/actions.js

@@ -1,3 +0,0 @@
-export default {
-    
-}

src/store/modules/exam/index.js

@@ -1,14 +0,0 @@
-import actions from "./actions"
-import mutations from "./mutations"
-
-const state = {
-    name:''
-}
-
-
-export default {
-    namespaced: true,
-    state,
-    mutations,
-    actions
-}

src/store/modules/exam/mutations.js

@@ -1,3 +0,0 @@
-export default {
-    
-}

src/store/modules/learn/actions.js

@@ -1,3 +0,0 @@
-export default {
-    
-}

src/store/modules/learn/index.js

@@ -1,14 +0,0 @@
-import actions from "./actions"
-import mutations from "./mutations"
-
-const state = {
-    name:''
-}
-
-
-export default {
-    namespaced: true,
-    state,
-    mutations,
-    actions
-}

src/store/modules/learn/mutations.js

@@ -1,3 +0,0 @@
-export default {
-    
-}

src/store/modules/profile/actions.js

@@ -1,3 +0,0 @@
-export default {
-    
-}

src/store/modules/profile/index.js

@@ -1,14 +0,0 @@
-import actions from "./actions"
-import mutations from "./mutations"
-
-const state = {
-    name:''
-}
-
-
-export default {
-    namespaced: true,
-    state,
-    mutations,
-    actions
-}

src/store/modules/profile/mutations.js

@@ -1,3 +0,0 @@
-export default {
-    
-}

src/store/modules/user/actions.js

@@ -13,7 +13,7 @@ export default {
     commit('set_token', data.token);
     commit('set_username', data.accountBase.accountName);
     commit('set_usercode', data.accountBase.accountCode);
-    uni.setStorageSync('knowledge_mobile_token', data.token);
+    uni.setStorageSync('recycle_mobile_token', data.token);
   },
   // 登录
   async login({
@@ -26,7 +26,7 @@ export default {
     commit('set_token', data.token);
     commit('set_username', data.accountBase.accountName);
     commit('set_usercode', data.accountBase.accountCode);
-    uni.setStorageSync('knowledge_mobile_token', data.token);
+    uni.setStorageSync('recycle_mobile_token', data.token);
   },
 
   // 获取用户信息
@@ -40,7 +40,7 @@ export default {
     let {
       data
     } = res;
-    uni.setStorageSync('knowledge_mobile_user', data);
+    uni.setStorageSync('recycle_mobile_user', data);
   },
 
   // 清除登录信息

src/store/modules/user/index.js

@@ -1,12 +1,12 @@
 import actions from "./actions"
 import mutations from "./mutations"
 
-const userinfo = uni.getStorageSync('knowledge_mobile_user');
+const userinfo = uni.getStorageSync('recycle_mobile_user');
 
 const state = {
   username: userinfo ? userinfo.accountBase.accountName : '',
   usercode: userinfo ? userinfo.accountBase.accountCode : '',
-  token: uni.getStorageSync('knowledge_mobile_token') || '',
+  token: uni.getStorageSync('recycle_mobile_token') || '',
   downloadFlag: userinfo ? userinfo.accountBase.downloadFlag : '',
 
 }

src/store/modules/wiki/actions.js

@@ -1,3 +0,0 @@
-export default {
-    
-}

src/store/modules/wiki/index.js

@@ -1,14 +0,0 @@
-import actions from "./actions"
-import mutations from "./mutations"
-
-const state = {
-    name:''
-}
-
-
-export default {
-    namespaced: true,
-    state,
-    mutations,
-    actions
-}