修改bug

src/components/Map/index.vue

@@ -81,15 +81,15 @@ const onClick = (e: any) => {
   ).then((data) => {
     if (data.status == 0) {
       if (form.value) {
-        form.value.address =
+        // form.value.address =
-          data.result.address_component.province +
+        //   data.result.address_component.province +
-          data.result.address_component.city +
+        //   data.result.address_component.city +
-          data.result.address_component.district +
+        //   data.result.address_component.district +
-          data.result.address_component.street +
+        //   data.result.address_component.street +
-          data.result.address_component.street_number;
+        //   data.result.address_component.street_number;
         form.value.latitude = data.result.location.lat;
         form.value.longitude = data.result.location.lng;
-        // form.value.province = data.result.address_component.province;
+        form.value.address = data.result.formatted_addresses.recommend;
         // form.value.city = data.result.address_component.city;
         // form.value.region = data.result.ad_info.adcode; //行政区划编码
         form.value.regionCode = data.result.ad_info.adcode; //行政区划编码
@@ -121,18 +121,18 @@ const performSearch = async (text) => {
       if (data.status == 0) {
         center.value.lat = data.result.location.lat;
         center.value.lng = data.result.location.lng;
-        form.value.address =
+        // form.value.address =
-          data.result.address_components.province +
+        //   data.result.address_components.province +
-          data.result.address_components.city +
+        //   data.result.address_components.city +
-          data.result.address_components.district +
+        //   data.result.address_components.district +
-          data.result.address_components.street +
+        //   data.result.address_components.street +
-          data.result.address_components.street_number;
+        //   data.result.address_components.street_number;
         form.value.latitude = data.result.location.lat;
         form.value.longitude = data.result.location.lng;
         // form.value.region = data.result.ad_info.adcode; //行政区划编码
         // form.value.regionCode = data.result.ad_info.adcode; //行政区划编码
 
-        // form.value.province = data.result.address_components.province;
+        form.value.address = data.result.formatted_addresses.recommend;
         // form.value.city = data.result.address_components.city;
         geometries.value = [{ styleId: 'marker', position: { lat: data.result.location.lat, lng: data.result.location.lng } }];
         console.log(form.value);

src/views/manage/activity/index.vue

@@ -53,8 +53,8 @@
       </el-table-column>
       <el-table-column label="活动时间" align="center" prop="activityTime" width="180px" />
       <el-table-column label="报名截止时间" align="center" prop="registrationDeadline" width="180px" />
-      <el-table-column label="发布者地址" align="center" prop="publisherAddress" width="120px" />
+      <el-table-column label="发布者地址" align="center" prop="publisherAddress" width="180px" show-overflow-tooltip />
-      <el-table-column label="活动地点" align="center" prop="activityLocation" width="180px" />
+      <el-table-column label="活动地点" align="center" prop="activityLocation" width="180px" show-overflow-tooltip />
       <el-table-column label="收费方式" align="center" prop="paymentMethod" width="100px">
         <template #default="scope">
           <div>{{ scope.row.paymentMethod == 1 ? '发起人收款' : '免费' }}</div>
@@ -62,7 +62,7 @@
       </el-table-column>
       <el-table-column label="活动流程" align="center" prop="" width="100px">
         <template #default="scope">
-          <el-button link type="primary" @click="chakanhandle(scope.row)">查看详情</el-button>
+          <el-button link type="primary" @click="handleUpdate(scope.row, 3)">查看详情</el-button>
         </template>
       </el-table-column>
       <el-table-column label="问答" align="center" prop="" width="100px">
@@ -89,7 +89,7 @@
             v-hasPermi="['system:article:edit']"
             link
             type="primary"
-            @click="handleUpdate(scope.row)"
+            @click="handleUpdate(scope.row, 1)"
             >编辑</el-button
           >
           <el-button v-if="scope.row.status == 0" v-hasPermi="['system:article:edit']" link type="primary" @click="saveupdate(scope.row, 1)"
@@ -140,7 +140,7 @@
             <el-date-picker
               v-model="form.activityTime"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD hh:mm:ss"
+              value-format="YYYY-MM-DD HH:mm:ss"
               type="datetime"
               placeholder="请选择活动时间"
             />
@@ -149,7 +149,7 @@
             <el-date-picker
               v-model="form.registrationDeadline"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD hh:mm:ss"
+              value-format="YYYY-MM-DD HH:mm:ss"
               type="datetime"
               placeholder="请选择报名截至时间"
             />
@@ -181,7 +181,7 @@
               <el-date-picker
                 v-model="item.activityTime"
                 format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
                 type="datetime"
                 placeholder="请选择行程时间"
               />
@@ -200,6 +200,60 @@
         </div>
       </template>
     </el-dialog>
+    <!-- 查看活动流程 -->
+    <el-dialog v-model="seedialog.visible" :title="seedialog.title" width="60%" append-to-body>
+      <el-form ref="activityFormRef" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="活动名称">
+          <div>{{ form.activityName }}</div>
+        </el-form-item>
+        <el-form-item label="活动描述">
+          <div>{{ form.activityDescription }}</div>
+        </el-form-item>
+        <el-form-item label="活动人数">
+          <div>{{ form.activityUserCount }}人</div>
+        </el-form-item>
+        <div style="display: flex">
+          <el-form-item label="活动时间">
+            <div>{{ form.activityTime }}</div>
+          </el-form-item>
+          <el-form-item label="报名截至时间">
+            <div>{{ form.registrationDeadline }}</div>
+          </el-form-item>
+        </div>
+        <div style="display: flex">
+          <el-form-item label="发布者地址">
+            <div>{{ form.publisherAddress }}</div>
+          </el-form-item>
+          <el-form-item label="活动地点">
+            <div>{{ form.activityLocation }}</div>
+          </el-form-item>
+        </div>
+        <el-form-item label="收费方式">
+          <el-radio-group v-model="form.paymentMethod" disabled>
+            <el-radio :value="1">发起人收款</el-radio>
+            <el-radio :value="0">免费</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="挑选玩友">
+          <el-radio-group v-model="form.isSelected" disabled>
+            <el-radio :value="1">挑选</el-radio>
+            <el-radio :value="0">不挑选</el-radio>
+          </el-radio-group>
+          <span style="margin-left: 30px; font-size: 12px; color: #707070">勾选后，发起人需要逐个审核报名者，确认是否通过报名</span>
+        </el-form-item>
+        <el-form-item label="活动流程"> </el-form-item>
+        <div v-for="(item, index) in listdatatime">
+          <div style="display: flex; align-items: center">
+            <el-form-item label="时间">
+              <div>{{ item.activityTime }}</div>
+            </el-form-item>
+            <el-form-item label="计划的活动内容">
+              <div>{{ item.planContent }}</div>
+            </el-form-item>
+          </div>
+        </div>
+      </el-form>
+    </el-dialog>
     <!--    问答弹窗-->
     <el-dialog v-model="wendadialog.visible" title="问答" width="40%" append-to-body>
       <div v-for="item in Answeringlist" style="line-height: 30px; padding: 0 20px">
@@ -318,6 +372,10 @@ const dialog = reactive<DialogOption>({
   visible: false,
   title: ''
 });
+const seedialog = reactive<DialogOption>({
+  visible: false,
+  title: '活动流程'
+});
 const wendadialog = reactive<DialogOption>({
   visible: false
 });
@@ -435,6 +493,16 @@ const handleAdd = () => {
   reset();
   dialog.visible = true;
   listdatatime.value = [{ activityTime: '', planContent: '' }];
+  Mapvalue.value = {
+    address: '',
+    longitude: '',
+    latitude: ''
+  };
+  Mapvaluetwo.value = {
+    address:'',
+    longitude: '',
+    latitude: ''
+  };
   dialog.title = '添加活动信息';
 };
 // 发布撤销发布
@@ -453,7 +521,7 @@ const saveupdate = async (row?: ActivityVO, type) => {
   // await updateActivity(form.value).finally(() => (buttonLoading.value = false));
 };
 /** 修改按钮操作 */
-const handleUpdate = async (row?: ActivityVO) => {
+const handleUpdate = async (row?: ActivityVO, type) => {
   reset();
   const _id = row?.id || ids.value[0];
   const res = await getActivity(_id);
@@ -473,8 +541,12 @@ const handleUpdate = async (row?: ActivityVO) => {
     latitude: res.data.activityLatitude
   };
   listdatatime.value = arr.data;
+  if (type == 3) {
+    seedialog.visible = true;
+  } else {
     dialog.visible = true;
     dialog.title = '修改活动信息';
+  }
 };
 
 /** 提交按钮 */
@@ -551,6 +623,7 @@ const registrationCountnumlist = async () => {
   activityUserstotal.value = res.total;
   numdialog.visible = true;
 };
+//查看活动流程
 const chakanhandle = async (row?: ActivityVO) => {};
 onMounted(() => {
   getList();

src/views/manage/mkJigsaw/index.vue

@@ -8,8 +8,8 @@
               <el-input v-model="queryParams.name" placeholder="请输入任务名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="任务状态" prop="category">
-              <el-select v-model="queryParams.category" placeholder="请选择任务状态" clearable>
+              <el-select v-model="queryParams.status" class="inputWidth" placeholder="请选择发布状态" clearable>
-                <el-option v-for="dict in mk_jigsaw_task_catagory" :key="dict.value" :label="dict.label" :value="dict.value" />
+                <el-option v-for="dict in note_publish_list" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
             <el-form-item>
@@ -73,12 +73,22 @@
             <el-tag v-if="scope.row.status == 2" type="primary">已发布</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="创建人" align="center" prop="awardCount" />
+        <el-table-column label="创建人" align="center" prop="createName" />
-        <el-table-column label="创建时间" align="center" prop="awardCount" />
+        <el-table-column label="创建时间" align="center" prop="createTime" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120px">
           <template #default="scope">
-            <el-button v-hasPermi="['manage:mkJigsaw:edit']" link type="primary" @click="handleUpdate(scope.row, 2)">编辑</el-button>
+            <el-button v-if="scope.row.status == 0" v-hasPermi="['manage:mkJigsaw:edit']" link type="primary" @click="handleUpdate(scope.row, 2)"
-            <el-button v-hasPermi="['manage:mkJigsaw:remove']" link type="primary" @click="handleDelete(scope.row)">删除</el-button>
+              >编辑</el-button
+            >
+            <el-button v-if="scope.row.status == 0" v-hasPermi="['manage:mkJigsaw:remove']" link type="primary" @click="handleDelete(scope.row)"
+              >删除</el-button
+            >
+            <el-button v-if="scope.row.status == 0" v-hasPermi="['manage:mkJigsaw:remove']" link type="primary" @click="saveupdate(scope.row, 1)"
+              >发布</el-button
+            >
+            <el-button v-if="scope.row.status == 2" v-hasPermi="['manage:mkJigsaw:remove']" link type="primary" @click="saveupdate(scope.row, 2)"
+              >撤销发布</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -123,6 +133,8 @@
             date-format="YYYY/MM/DD ddd"
             time-format="A hh:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss"
+            :picker-options="{ disabledDate: dateOptions }"
+            @change="mkdatetime"
           />
         </el-form-item>
         <el-form-item label="设置拼图数量" prop="jigsawConfigCount">
@@ -151,6 +163,57 @@
         </div>
       </template>
     </el-dialog>
+    <!-- 查看拼图游戏对话框 -->
+    <el-dialog v-model="mksave.visible" :title="mksave.title" width="50%" append-to-body>
+      <el-form ref="mkJigsawFormRef" :model="form" label-width="140px">
+        <el-form-item label="任务名称">
+          <div>{{ form.name }}</div>
+        </el-form-item>
+        <el-form-item label="任务类别">
+          <el-select v-model="form.category" placeholder="请选择任务类别" style="width: 300px" disabled>
+            <el-option v-for="dict in mk_jigsaw_task_catagory" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="选择商品">
+          <el-select v-model="form.productId" placeholder="请选择商品" style="width: 300px" disabled @change="goodssave">
+            <el-option v-for="item in imagegoodsoptions" :key="item.id" :label="item.productName" :value="item.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-table :data="goodsdata" border style="width: 100%">
+            <el-table-column prop="id" label="商品ID" width="180" />
+            <el-table-column prop="productName" label="商品名称" width="180" />
+            <el-table-column prop="categoryId" label="商品类别">
+              <template #default="scope">
+                <span>{{ goodsleibiesave(scope.row.categoryId) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="" label="商品图片" />
+          </el-table>
+        </el-form-item>
+        <el-form-item label="活动时间" prop="startDate" style="width: 500px">
+          <div>{{ form.startDate }}~{{ form.endDate }}</div>
+        </el-form-item>
+        <el-form-item label="设置拼图数量">
+          <div>{{form.jigsawConfigCount}}</div>
+        </el-form-item>
+        <el-form-item label="得奖人数">
+          <div>{{form.awardConfigCount}}</div>
+        </el-form-item>
+        <el-form-item label="控制得奖拼图">
+          <el-select v-model="form.controlJigsawIndex" placeholder="请选择控制得奖拼图" style="width: 300px" @change="selectnumlist" disabled>
+            <el-option v-for="dict in numlist" :key="dict.label" :label="dict.label" :value="dict.label"></el-option>
+          </el-select>
+        </el-form-item>
+        <div class="numlistclasss">
+          <div v-for="item in numlistdata" :key="item.name">
+            <el-form-item :label="`${item.name}：可获得概率`">
+              <div>{{item.probability}}%</div>
+            </el-form-item>
+          </div>
+        </div>
+      </el-form>
+    </el-dialog>
     <!--    拼图碎片获得人数-->
     <el-dialog v-model="imagedialog.visible" :title="imagedialog.title" width="50%" append-to-body>
       <el-table :data="imagelistdata" border style="width: 100%">
@@ -192,6 +255,12 @@ const mkJigsawFormRef = ref<ElFormInstance>();
 const imagegoodsoptions = ref([]);
 const goodsdata = ref([]);
 const imagelistdata = ref([]);
+const note_publish_list = ref([
+  { label: '已发布', value: 2 },
+  { label: '审核中', value: 1 },
+  { label: '未发布', value: 0 }
+  // { label: '草稿', value: 1 }
+]);
 const goodleibielist = ref([]);
 const dialog = reactive<DialogOption>({
   visible: false,
@@ -276,7 +345,7 @@ const data = reactive<PageData<MkJigsawForm, MkJigsawQuery>>({
     controlJigsawIndex: [{ required: true, message: '控制得奖拼图不能为空', trigger: 'blur' }],
     joinCount: [{ required: true, message: '参与人数不能为空', trigger: 'blur' }],
     awardCount: [{ required: true, message: '实际得奖人数不能为空', trigger: 'blur' }],
-    status: [{ required: true, message: '发布状态 0-未发布 1-已发布不能为空', trigger: 'change' }]
+    status: [{ required: true, message: '发布状态不能为空', trigger: 'change' }]
   }
 });
 
@@ -311,6 +380,7 @@ const handleQuery = () => {
 
 /** 重置按钮操作 */
 const resetQuery = () => {
+  queryParams.value.status = '';
   queryFormRef.value?.resetFields();
   handleQuery();
 };
@@ -358,8 +428,12 @@ const handleUpdate = async (row?: MkJigsawVO, type) => {
     value2.value = [form.value.startDate, form.value.endDate];
     // form.value.endDate = value2.value[1];
   }
+  if (type == 1) {
+    mksave.visible = true;
+  } else {
     dialog.visible = true;
     dialog.title = '修改拼图任务';
+  }
 };
 
 /** 提交按钮 */
@@ -389,11 +463,26 @@ const submitForm = () => {
     }
   });
 };
-
+// 发布撤销发布
+const saveupdate = async (row?: MkJigsawVO, type) => {
+  const _id = row?.id || ids.value[0];
+  const res = await getMkJigsaw(_id);
+  Object.assign(form.value, res.data);
+  form.value.status = type == 1 ? 1 : 0;
+  const test = type == 1 ? '发布' : '撤销发布';
+  const _ids = row?.name || ids.value;
+  await proxy?.$modal.confirm('是否确认' + test + '拼图游戏名称为' + _ids + '的数据项？').finally(() => (loading.value = false));
+  await updateMkJigsaw(form.value).finally(() => (buttonLoading.value = false));
+  proxy?.$modal.msgSuccess(test + '成功');
+  await getList();
+  // await updateActivity(form.value).finally(() => (buttonLoading.value = false));
+};
 /** 删除按钮操作 */
 const handleDelete = async (row?: MkJigsawVO) => {
   const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除拼图游戏编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  const _idsname = row?.name || ids.value;
+
+  await proxy?.$modal.confirm('是否确认删除拼图游戏名称为"' + _idsname + '"的数据项？').finally(() => (loading.value = false));
   await delMkJigsaw(_ids);
   proxy?.$modal.msgSuccess('删除成功');
   await getList();
@@ -426,7 +515,7 @@ const selectnumlist = () => {
 };
 /*商品列表*/
 const getproductall = async () => {
-  const res = await productall();
+  const res = await productall({ status: 1 });
   console.log(res);
   imagegoodsoptions.value = res.data;
 };
@@ -451,7 +540,12 @@ const imagesui = async (row) => {
   console.log(row);
   const res = await mkJigsawDetaillist({ jigsawId: row.id });
   console.log(res);
-  imagelistdata.value = res.data;
+  imagelistdata.value = res.data.map((item, index) => {
+    return {
+      ...item,
+      probability: index == 0 ? `${item.probability}人` : `${item.probability}%`
+    };
+  });
 };
 const goodleibie = async () => {
   const res = await productCategoryall();
@@ -459,14 +553,23 @@ const goodleibie = async () => {
 };
 const goodsleibiesave = (id) => {
   for (let i = 0; i < goodleibielist.value.length; i++) {
-    console.log(goodleibielist.value[i].id);
+    // console.log(goodleibielist.value[i].id);
     if (goodleibielist.value[i].id === id) {
       return goodleibielist.value[i].category;
     }
   }
   return null;
 };
-
+// 选择今天及今天以后的日期
+const dateOptions = (time) => {
+  return time.getTime() < Date.now() - 8.64e6;
+};
+const mkdatetime = () => {
+  if (value2.value.length > 0) {
+    form.value.startDate = value2.value[0];
+    form.value.endDate = value2.value[1];
+  }
+};
 onMounted(() => {
   getList();
   getproductall();

src/views/manage/noteManage/index.vue

@@ -19,7 +19,7 @@
             </el-form-item>
             <el-form-item label="发布状态" prop="tagId">
               <!-- <el-input v-model="queryParams.tagId" placeholder="请输入标签" clearable @keyup.enter="handleQuery" /> -->
-              <el-select v-model="queryParams.tagId" placeholder="请选择发布状态" style="width: 240px" @keyup.enter="handleQuery">
+              <el-select v-model="queryParams.status" placeholder="请选择发布状态" style="width: 240px" @keyup.enter="handleQuery">
                 <el-option v-for="item in statusoptions" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -168,8 +168,8 @@
     <!--    笔记详情-->
     <el-dialog v-model="concentdialog.visible" title="笔记详情" width="50%" append-to-body>
       <div>{{ form.title }}</div>
-      <div>{{formatTag(form.tagId) }}</div>
+      <div>{{ formatTag(form.tagId) }}</div>
-      <div>{{formatlocation(form.location) }}</div>
+      <div>{{ formatlocation(form.location) }}</div>
       <div v-html="form.content"></div>
     </el-dialog>
     <!-- 评论详情 -->
@@ -375,6 +375,7 @@ const handleQuery = () => {
 
 /** 重置按钮操作 */
 const resetQuery = () => {
+  queryParams.value.status = '';
   queryFormRef.value?.resetFields();
   handleQuery();
 };
@@ -408,7 +409,7 @@ const handleUpdate = async (row?: NotebookVO) => {
 
 const fabudata = async (row?: NotebookVO) => {
   const _id = row?.id || ids.value[0];
-  const _idtitle = row?.title ;
+  const _idtitle = row?.title;
   const res = await getNotebook(_id);
   Object.assign(form.value, res.data);
   form.value.status = row.status == 3 ? 0 : 2;

src/views/manage/report/index.vue

@@ -7,9 +7,6 @@
             <el-form-item label="用户昵称" prop="contentId">
               <el-input v-model="queryParams.contentId" placeholder="请输入用户昵称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="手机号" prop="reportUserId">
-              <el-input v-model="queryParams.reportUserId" placeholder="请输入手机号" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
             <el-form-item label="账号状态" prop="handlingStatus">
               <el-select v-model="queryParams.handlingStatus" placeholder="请选择状态" clearable>
                 <!--                <el-option v-for="dict in dy_banned_handling_status" :key="dict.value" :label="dict.label" :value="dict.value" />-->
@@ -63,7 +60,7 @@
         <el-table-column label="用户ID" align="center" prop="reportUserId" />
         <el-table-column label="会员等级" align="center" prop="userLevel">
           <template #default="scope">
-            <div>{{formatlevel(scope.row.userLevel)}}</div>
+            <div>{{formatlevel(scope.row.levelId)}}</div>
           </template>
         </el-table-column>
         <el-table-column label="昵称" align="center" prop="nickName" />