Merge branch 'feat/meeting' of https://git.tsl3060.com/jgl/photo_uniapp into feat/meeting

meeting/common.scss

@@ -7,8 +7,12 @@
 .mb-30{
     margin-bottom: 30rpx;
 }
-
+.mb-40{
-
+    margin-bottom: 40rpx;
+}
+.mb-48{
+    margin-bottom: 48rpx;
+}
 
 
 .pt-44{

meeting/summary/index.vue

@@ -93,6 +93,25 @@
           AI会议、智能助手、需求评审会、AI会议、智能助手、需求评审会、AI会议、智能助手、需求评审会、AI会议、智能助手、需求评审会。
         </view>
       </view>
+      <!-- 底部 -->
+      <view class="footer flex">
+        <view class="btn push">
+          <image
+            src="/static/image/summary/upcloud.png"
+            mode="scaleToFill"
+            class="icon"
+          />
+          <view>导出</view>
+        </view>
+        <view class="btn op">
+          <image
+            src="/static/image/summary/op.png"
+            mode="scaleToFill"
+            class="icon"
+          />
+          <view>格式优化</view>
+        </view>
+      </view>
 
       <!-- 弹窗 -->
       <meet-pop
@@ -146,8 +165,49 @@ export default {
 <style lang="scss" scoped>
 @import "../common.scss";
 
-.content{
+.footer {
-    padding-bottom: 200rpx ;
+  height: 180rpx;
+  width: 100%;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  background-color: #f2f7fe;
+  border-top: 4rpx #fff solid;
+  box-sizing: border-box;
+  padding: 0 24rpx;
+  padding-top: 16rpx;
+  .btn {
+    height: 80rpx;
+    line-height: 80rpx;
+    font-weight: 700;
+    font-size: 30rpx;
+    box-sizing: border-box;
+    display: flex;
+    align-content: center;
+    border-radius: 20rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  .push {
+    margin-right: 20rpx;
+    color: #1467ff;
+    width: 248rpx;
+    border: 2rpx solid #1467ff;
+  }
+  .op {
+    background-color: #1467ff;
+    width: 434rpx;
+    color: #fff;
+  }
+  .icon {
+    width: 40rpx;
+    height: 40rpx;
+    margin-right: 12rpx;
+  }
+}
+.content {
+  padding-bottom: 200rpx;
 }
 .container {
   padding: 24rpx;

meeting/user/doc.vue

@@ -0,0 +1,95 @@
+<template>
+  <view>
+    <meet-sticky :bg="bg">
+      <meet-navbar title="帮助文档" :isFixed="false"></meet-navbar>
+    </meet-sticky>
+    <view class="container">
+      <view class="title"> 问题反馈 </view>
+      <view class="content">
+        <u-collapse accordion>
+          <u-collapse-item
+            :title="item.title"
+            v-for="(item, index) in docList"
+            :key="index"
+          >
+            <view class="collapse-item">
+              <view v-for="(t, i) in item.explain" :key="i">
+                <view>{{ t }}</view>
+              </view>
+            </view>
+          </u-collapse-item>
+        </u-collapse>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      docList: [
+        {
+          title: "1.文字处理时间",
+          explain: ["11111111111", "222222222222"],
+        },
+        {
+          title: "2.支持的语言",
+          explain: ["11111111111", "222222222222"],
+        },
+      ],
+    };
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.collapse-item {
+  background: #ffffff;
+  border-radius: 16rpx 16rpx 16rpx 16rpx;
+  padding: 20rpx;
+  line-height: 1.8;
+}
+.content {
+  background: #f4f7ff;
+  border-radius: 24rpx 24rpx 24rpx 24rpx;
+  border: 2rpx solid #ffffff;
+  flex: 1;
+}
+.container {
+  padding: 24rpx;
+  height: 85vh;
+  display: flex;
+  flex-direction: column;
+}
+.u-page {
+  padding: 0;
+
+  &__item {
+    &__title {
+      color: $u-tips-color;
+      background-color: $u-bg-color;
+      padding: 15px;
+      font-size: 15px;
+
+      &__slot-title {
+        color: $u-primary;
+        font-size: 14px;
+      }
+    }
+  }
+}
+.title {
+  font-weight: 700;
+  font-size: 32rpx;
+  color: #23262b;
+  margin-bottom: 24rpx;
+}
+.u-collapse-content {
+  color: $u-tips-color;
+  font-size: 14px;
+}
+::v-deep .u-line {
+  border-bottom-style: none !important;
+}
+</style>

meeting/user/file.vue

@@ -0,0 +1,128 @@
+<template>
+  <div class="container">
+    <meet-sticky :bg="bg">
+      <meet-navbar title="会议记录" :isFixed="false"></meet-navbar>
+    </meet-sticky>
+    <div>
+      <div class="mb-30">
+        <u-search
+          placeholder="日照香炉生紫烟"
+          v-model="keyword"
+          :showAction="false"
+          :customStyle="customStyle1"
+        ></u-search>
+      </div>
+      <view>
+        <view class="record-item mb-24">
+          <view class="flex justify-between items-center">
+            <view class="title"> 这是一个标题 </view>
+            <view>
+              <image
+                src="/static/image/user/share.png"
+                mode="scaleToFill"
+                class="icon"
+              />
+              <image
+                src="/static/image/user/more.png"
+                mode="scaleToFill"
+                class="icon"
+                @click.stop="upMask"
+              />
+            </view>
+          </view>
+
+          <view class="mask" v-if="popup">
+            <view>导出</view>
+            <view>重命名</view>
+            <view>删除</view>
+          </view>
+        </view>
+      </view>
+    </div>
+  </div>
+</template>
+
+ <script>
+export default {
+  data() {
+    return {
+      keyword: "遥看瀑布挂前川",
+      bg: "",
+      popup: false,
+      customStyle1: {
+        background:
+          "linear-gradient( 180deg, rgba(255,255,255,0.4) 0%, rgba(255,255,255,0.6) 100%)",
+        borderRadius: "40rpx",
+        border: " 2rpx solid #FFFFFF",
+      },
+    };
+  },
+  methods: {
+    upMask() {
+      this.popup = !this.popup;
+    },
+  },
+};
+</script>
+    
+<style lang="scss" scoped>
+@import "../common.scss";
+.icon {
+  width: 40rpx;
+  height: 40rpx;
+  margin-left: 16rpx;
+}
+.mask {
+  position: absolute;
+  width: 168rpx;
+  height: 232rpx;
+  background-color: #fff;
+  border-radius: 16rpx;
+  top: 80rpx;
+  right: 16rpx;
+  padding: 24rpx;
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+}
+
+.record-item {
+  position: relative;
+  //   height: 168rpx;
+  border-radius: 24rpx;
+  border: 2rpx #fff solid;
+  padding: 32rpx 24rpx;
+  //   padding-bottom: 36rpx;
+  background: linear-gradient(
+    180deg,
+    rgba(255, 255, 255, 0.4) 0%,
+    rgba(255, 255, 255, 0.6) 100%
+  );
+  .title {
+    font-weight: 700;
+    font-size: 28rpx;
+    color: #23262b;
+    // line-height: 40rpx;
+  }
+}
+.container {
+  min-height: 100vh;
+  background-color: #d1dcfe;
+  padding: 20rpx 24rpx;
+}
+::v-deep .u-search__content {
+  background-color: linear-gradient(
+    180deg,
+    rgba(255, 255, 255, 0.4) 0%,
+    rgba(255, 255, 255, 0.6) 100%
+  ) !important;
+}
+::v-deep .u-search__content__input {
+  background-color: linear-gradient(
+    180deg,
+    rgba(255, 255, 255, 0.4) 0%,
+    rgba(255, 255, 255, 0.6) 100%
+  ) !important;
+}
+</style>

meeting/user/index.vue

@@ -0,0 +1,134 @@
+<template>
+  <view class="container">
+    <meet-navbar title="我的" :isFixed="false" :iconType="0"></meet-navbar>
+    <view>
+      <!-- touxiang -->
+      <view class="flex items-center mb-40">
+        <view class="avatar-box">
+          <image src="/static/image/bg.png" mode="scaleToFill" class="avatar" />
+        </view>
+        <view>
+          <view class="nickname">用户名</view>
+          <view class="status">未登录</view>
+        </view>
+      </view>
+      <!-- 分享 -->
+      <view>
+        <image
+          src="/static/image/user/shear.png"
+          mode="scaleToFill"
+          class="shear"
+        />
+      </view>
+      <!-- menu -->
+      <view class="menu">
+        <view class="flex items-center menu-item" v-for="item in menuList" :key="item">
+          <image :src="item.icon" mode="scaleToFill" class="icon" />
+          <view class="name">{{ item.n }}</view>
+          <image
+            src="/static/image/user/right.png"
+            mode="scaleToFill"
+            class="right"
+          />
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      menuList: [
+        {
+          icon: "/static/image/user/flie.png",
+          n: "我的附件",
+          url: "",
+        },
+        {
+          icon: "/static/image/user/edit.png",
+          n: "意见反馈",
+          url: "",
+        },
+        {
+          icon: "/static/image/user/doc.png",
+          n: "帮助文档",
+          url: "",
+        },
+        {
+          icon: "/static/image/user/alert-circle.png",
+          n: "帮助文档",
+          url: "",
+        },
+      ],
+    };
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../common.scss";
+.menu {
+    background-color: #EEF7FE;
+    border: 4rpx solid #fff;
+    border-radius: 24rpx;
+    padding: 0 24rpx;
+    padding-top: 48rpx;
+  .right {
+    width: 36rpx;
+    height: 36rpx;
+  }
+  .name {
+    font-weight: 400;
+    font-size: 30rpx;
+    color: #23262b;
+    flex: 1;
+  }
+  .icon {
+    width: 36rpx;
+    height: 36rpx;
+    margin-right: 24rpx;
+  }
+  .menu-item{
+    margin-bottom: 48rpx;
+
+  }
+}
+.shear {
+  width: 100%;
+  height: 160rpx;
+  margin-bottom: 24rpx;
+}
+.status {
+  font-weight: 400;
+  font-size: 28rpx;
+  color: #93999f;
+}
+.nickname {
+  font-weight: 700;
+  font-size: 36rpx;
+  color: #23262b;
+  line-height: 1.8;
+}
+.avatar {
+  width: 144rpx;
+  height: 144rpx;
+  border-radius: 26rpx;
+}
+.avatar-box {
+  width: 176rpx;
+  height: 176rpx;
+  padding: 16rpx;
+  border-radius: 26rpx;
+  background-color: #fff;
+  box-sizing: border-box;
+  margin-right: 24rpx;
+}
+.container {
+  min-height: 100vh;
+  background-color: #d1dcfe;
+  padding: 20rpx 24rpx;
+  box-sizing: border-box;
+}
+</style>

meeting/user/opinion.vue

@@ -0,0 +1,166 @@
+<template>
+  <view class="container">
+    <meet-sticky :bg="bg">
+      <meet-navbar title="意见反馈" :isFixed="false"></meet-navbar>
+    </meet-sticky>
+    <view class="content">
+      <view class="title"> 问题反馈 </view>
+      <view class="mb-24">
+        <u--textarea
+          v-model="value2"
+          placeholder="请输入内容"
+          count
+          :maxlength="150"
+          :height="215"
+          :border="border"
+        ></u--textarea>
+      </view>
+      <view class="mb-48">
+        <u-upload
+          :fileList="fileList6"
+          @afterRead="afterRead"
+          @delete="deletePic"
+          name="6"
+          multiple
+          :maxCount="1"
+          width="156"
+          height="156"
+        >
+          <view class="push">
+            <image
+              src="/static/image/user/push.png"
+              mode="scaleToFill"
+              class="icon"
+            />
+            <view class="txt">添加截图</view>
+          </view>
+        </u-upload>
+      </view>
+      <view class="title"> 联系方式 </view>
+      <view>
+        <u--input
+          placeholder="请输入手机号"
+          border="surround"
+          v-model="value"
+          clearable
+        ></u--input>
+      </view>
+      <!-- <view class="mb-30">
+        <u-search
+          placeholder="日照香炉生紫烟"
+          v-model="keyword"
+          :showAction="false"
+          :bgColor="bgColor"
+          borderColor="#fff"
+        ></u-search>
+      </view> -->
+    </view>
+  </view>
+</template>
+  
+   <script>
+export default {
+  data() {
+    return {
+      value2: "",
+      value: "",
+      border: "none",
+      keyword: "遥看瀑布挂前川",
+      bg: "",
+      popup: false,
+      bgColor: "#eef8fe05",
+      fileList6: [],
+    };
+  },
+  methods: {
+    upMask() {
+      this.popup = !this.popup;
+    },
+    afterRead(e) {
+      console.log(e);
+    },
+    deletePic(e) {
+      console.log(e);
+    },
+  },
+};
+</script>
+      
+  <style lang="scss" scoped>
+@import "../common.scss";
+.push {
+  width: 156rpx;
+  height: 156rpx;
+  background: linear-gradient(
+    180deg,
+    rgba(255, 255, 255, 0.4) 0%,
+    rgba(255, 255, 255, 0.6) 100%
+  );
+  border: 2rpx solid #ffffff;
+  border-radius: 24rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  .txt {
+    font-weight: 400;
+    font-size: 24rpx;
+    color: #93999f;
+  }
+}
+.title {
+  font-weight: 700;
+  font-size: 32rpx;
+  color: #23262b;
+  margin-bottom: 24rpx;
+}
+.icon {
+  width: 40rpx;
+  height: 40rpx;
+}
+.content {
+  padding: 0 24rpx;
+}
+.container {
+  min-height: 100vh;
+  background-color: #d1dcfe;
+  padding: 20rpx 0;
+}
+::v-deep .u-search__content {
+  background-color: linear-gradient(
+    180deg,
+    rgba(255, 255, 255, 0.4) 0%,
+    rgba(255, 255, 255, 0.6) 100%
+  ) !important;
+}
+::v-deep .u-search__content__input {
+  background-color: linear-gradient(
+    180deg,
+    rgba(255, 255, 255, 0.4) 0%,
+    rgba(255, 255, 255, 0.6) 100%
+  ) !important;
+}
+::v-deep .u-textarea {
+  border-radius: 24rpx !important;
+  background: linear-gradient(
+    180deg,
+    rgba(255, 255, 255, 0.4) 0%,
+    rgba(255, 255, 255, 0.6) 100%
+  ) !important;
+  border: 2rpx solid #ffffff;
+}
+::v-deep .u-textarea__count {
+  background-color: transparent !important;
+}
+::v-deep .u-input {
+  background: linear-gradient(
+    180deg,
+    rgba(255, 255, 255, 0.4) 0%,
+    rgba(255, 255, 255, 0.6) 100%
+  ) !important;
+  border-radius: 24rpx !important;
+  border: 2rpx solid #ffffff !important;
+  height: 96rpx !important;
+box-sizing: border-box !important;
+}
+</style>

pages.json

@@ -180,6 +180,40 @@
 				}
 			},
 			{
+				"path":"user/index",
+				"style": {
+					"navigationBarTitleText": "我的",
+					"navigationStyle": "custom",
+					"enablePullDownRefresh":false
+				}
+			},
+			{
+				"path":"user/file",
+				"style": {
+					"navigationBarTitleText": "我的附件",
+					"navigationStyle": "custom",
+					"enablePullDownRefresh":false
+				}
+			},
+			{
+				"path":"user/opinion",
+				"style": {
+					"navigationBarTitleText": "意见反馈",
+					"navigationStyle": "custom",
+					"enablePullDownRefresh":false
+				
+				}
+			}
+			,
+			{
+				"path":"user/doc",
+				"style": {
+					"navigationBarTitleText": "帮助文档",
+					"navigationStyle": "custom",
+					"enablePullDownRefresh":false
+				
+				}
+			},{
 				"path":"onlineDetails/index",
 				"style": {
 					"navigationBarTitleText": "会议详情",