2024-05-13

src/MAR/archivesMag/modules/add.vue

@@ -52,17 +52,6 @@
                     </a-col>
                     <a-col :span="24">
                       <a-form-item label="封面图" name="attinfos" :rules="[{ required: true, message: '请选择封面图',trigger:'change'}]">
-                        <!-- <previewImage v-if="from.cover && from.cover !== 1" :images="from.cover" @deleteSuccess="from.cover=''"></previewImage>
-                        <upload 
-                          v-else
-                          accept="image/png, image/jpeg"
-                          btntype="image"
-                          modeType="modal" 
-                          @fileChange="from.cover=1"
-                          style="margin-bottom:10px" 
-                          :bindData="{ownerid:from.sat_coursewareid,ownertable:'sat_courseware',usetype:'default'}" 
-                          @uploadSuccess="uploadSuccess"
-                        ></upload> -->
                         <Upload 
                           :bindData="{ownerid:from.sat_coursewareid,ownertable:'sat_courseware',usetype:'default'}"
                           @fileChange="from.attinfos='1'"  

src/MAR/archivesMag/modules/setClass/add.vue

@@ -18,16 +18,21 @@
               <a-input v-model:value="form.classname" placeholder="请输入分类名称"></a-input>
             </a-form-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-item label="描述" name="remarks">
+              <a-input v-model:value="form.remarks" placeholder="请输入描述"></a-input>
+            </a-form-item>
+          </a-col>
           <a-col :span="24">
             <a-form-item label="排序" name="sequence">
               <a-input v-model:value="form.sequence" placeholder="请输入排序"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :span="24" v-if="!props.data">
+          <!-- <a-col :span="24" v-if="!props.data">
             <a-form-item label="封面图" name="attinfos" :rules="[{ required: true, message: '请选择封面',trigger:'change'}]">
               <Upload ref="upload" :multiple="false" :bindData="bindData" accept="image/*" @fileChange="form.attinfos='1'"></Upload>
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <a-col :span="24">
             <a-form-item label="状态" name="isenable">
               <a-switch

src/MAR/archivesMag/modules/setClass/edit.vue

@@ -18,16 +18,21 @@
               <a-input v-model:value="form.classname" placeholder="请输入分类名称"></a-input>
             </a-form-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-item label="描述" name="remarks">
+              <a-input v-model:value="form.remarks" placeholder="请输入描述"></a-input>
+            </a-form-item>
+          </a-col>
           <a-col :span="24">
             <a-form-item label="排序" name="sequence">
               <a-input v-model:value="form.sequence" placeholder="请输入排序"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :span="24" v-if="data.parentid == 0">
+          <!-- <a-col :span="24" v-if="data.parentid == 0">
             <a-form-item label="封面图" name="attinfos" :rules="[{ required: true, message: '请选择封面',trigger:'change'}]">
               <Upload ref="upload" :multiple="false" @deleteSuccess="$refs.upload.fileList=[]" :bindData="bindData" accept="image/*" @fileChange="form.attinfos='1';"></Upload>
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <a-col :span="24">
             <a-form-item label="状态" name="isenable">
               <a-switch
@@ -94,7 +99,7 @@ const showDrawer = ()=>{
 const formRef = ref()
 
 const submit = async () => {
-  if (props.data.parentid == 0 && upload.value.fileList.length == 0) form.value.attinfos = ''
+  // if (props.data.parentid == 0 && upload.value.fileList.length == 0) form.value.attinfos = ''
   const values = await formRef.value.validateFields()
   let res = await Api.requested( {
     "id": "20240313144002",

src/MAR/archivesMag/modules/workManage/add.vue

@@ -28,17 +28,14 @@
           </a-col>
           <a-col :span="24">
             <a-form-item label="封面图" name="cover" :rules="[{ required: true, message: '请选择封面图',trigger:'change'}]">
-              <previewImage v-if="form.cover.length" :images="form.cover" @deleteSuccess="form.cover=[]"></previewImage>
-              <upload 
-                v-else
-                btntype="image"
-                modeType="modal" 
-                style="margin-bottom:10px" 
-                accept="image/*"
+              <Upload 
                 :bindData="{ownerid:form.sat_coursewaredetailid,ownertable:'sat_coursewaredetail',usetype:'avatar'}" 
                 @uploadSuccess="uploadSuccess"
                 @fileChange="fileChange"
-              ></upload>
+                accept="image/*"
+                ref="upload"
+                :multiple="false"
+              ></Upload>
               <p style="color:#b8b3b3">注：建议上传图片大小130x80像素，大小不超过2M，格式为JPG/PNG</p>
             </a-form-item>
           </a-col>
@@ -93,7 +90,7 @@
 
 <script setup>
 import previewImage from '@/components/previewImage/index.vue'
-import upload from '@/components/upload/index.vue'
+import Upload from '@/MAR/assetsStore/detail/fileUpload.vue'
 import Upload2 from './fileUpload.vue'
 import {ref,defineEmits, watch} from 'vue'
 import Api from '@/api/api'
@@ -159,7 +156,7 @@ const uploadSuccess = (res) => {
 
 //文件上传成功
 const fileChange = (res) => {
-  form.value.cover = res
+  form.value.cover = 1
 }
 
 const formRef = ref()

src/MAR/archivesMag/modules/workManage/edit.vue

@@ -28,7 +28,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-item label="封面图" name="cover" :rules="[{ required: true, message: '请选择封面图',trigger:'change'}]">
-              <previewImage v-if="form.cover.length" :disabled="isEdit" :images="form.cover" @deleteSuccess="form.cover=[]"></previewImage>
+              <!-- <previewImage v-if="form.cover.length" :disabled="isEdit" :images="form.cover" @deleteSuccess="form.cover=[]"></previewImage>
               <upload 
                 v-else
                 btntype="image"
@@ -38,7 +38,15 @@
                 :bindData="{ownerid:form.sat_coursewaredetailid,ownertable:'sat_coursewaredetail',usetype:'avatar'}" 
                 @uploadSuccess="uploadSuccess"
                 @fileChange="fileChange"
-              ></upload>
+              ></upload> -->
+              <Upload 
+                :bindData="{ownerid:form.sat_coursewaredetailid,ownertable:'sat_coursewaredetail',usetype:'avatar'}" 
+                @uploadSuccess="uploadSuccess"
+                @fileChange="fileChange"
+                accept="image/*"
+                ref="upload"
+                :multiple="false"
+              ></Upload>
               <p style="color:#b8b3b3">注：建议上传图片大小130x80像素，大小不超过2M，格式为JPG/PNG</p>
             </a-form-item>
           </a-col>
@@ -85,8 +93,8 @@
 </template>
 
 <script setup>
+import Upload from '@/MAR/assetsStore/detail/fileUpload.vue'
 import previewImage from '@/components/previewImage/index.vue'
-import upload from '@/components/upload/index.vue'
 import Upload2 from './fileUpload.vue'
 import {ref,defineEmits, watch, nextTick} from 'vue'
 import Api from '@/api/api'
@@ -119,15 +127,16 @@ let typeList = ref({
     accept:'audio/*'
   },
 })
+let upload = ref()
 let uploadEl = ref()
 let bindData = ref({})
 const showDrawer = async ()=>{
   visible.value = true
   form.value = Object.assign({},form.value,props.rowData)
-  form.value.cover = form.value.attinfos.filter(item => item.usetype == 'avatar')
   nextTick(() => {
     if (form.value.filetype == '图文') return
     uploadEl.value.fileList = form.value.attinfos.filter(item => item.usetype != 'avatar')
+    upload.value.fileList =utils.fileList(form.value.attinfos.filter(item => item.usetype == 'avatar'))
   })
   bindData.value = {
     "ownertable": 'sat_coursewaredetail',
@@ -149,7 +158,7 @@ const uploadSuccess = (res) => {
 
 //文件上传成功
 const fileChange = (res) => {
-  form.value.cover = res
+  form.value.cover = 1
 }
 
 const formRef = ref()

src/MAR/assetsStore/modules/Add.vue

@@ -490,6 +490,7 @@ const submit = async () => {
         }
       })
     }
+    formRef.value.resetFields()
     emit('onSuccess')
     modeVisible.value = false
   })

src/MAR/assetsStore/modules/setClass/add.vue

@@ -18,12 +18,17 @@
               <a-input v-model:value="form.classname" placeholder="请输入分类名称"></a-input>
             </a-form-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-item label="描述" name="remarks">
+              <a-input v-model:value="form.remarks" placeholder="请输入描述"></a-input>
+            </a-form-item>
+          </a-col>
           <a-col :span="24">
             <a-form-item label="排序" name="sequence">
               <a-input v-model:value="form.sequence" placeholder="请输入排序"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :span="24" v-if="!props.data">
+          <!-- <a-col :span="24" v-if="!props.data">
             <a-form-item label="封面图" name="attinfos" :rules="[{ required: true, message: '请选择封面',trigger:'change'}]">
               <Upload 
                 :bindData="bindData"
@@ -33,9 +38,8 @@
                 ref="upload"
               ></Upload>
               <p style="color:#b8b3b3">注：建议上传图片大小130x80像素，大小不超过2M，格式为JPG/PNG</p>
-              <!-- <Upload ref="upload" :multiple="false" :bindData="bindData" accept="image/*" @fileChange="form.attinfos='1'"></Upload> -->
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <a-col :span="24">
             <a-form-item label="状态" name="isenable">
               <a-switch
@@ -79,7 +83,8 @@ const form = ref({
   "isenable": 0,
   "parentid": 0,
   "sequence": 0,
-  "attinfos":[]
+  "attinfos":[],
+  "remarks":''
 })
 const showDrawer = ()=>{
   if (props.data) form.value.isenable = props.data.isenable
@@ -90,35 +95,18 @@ let upload = ref()
 const submit = async () => {
   const values = await formRef.value.validateFields()
   if (props.data) form.value.parentid = props.data.sat_sharematerial_classid
-  if (upload.value && !upload.value.fileList) form.value.attinfos = ''
+  // if (upload.value && !upload.value.fileList) form.value.attinfos = ''
   let res = await Api.requested( {
     "id": "20240403132302",
     content:form.value
   })
-  if (upload.value && upload.value.fileList.length) {
-    bindData.value = {
-      "ownertable": 'sat_sharematerial_class',
-      "ownerid": res.data.sat_sharematerial_classid,
-      "usetype": 'avatar',
-    }
-    loading.value = true
-    upload.value.toUpload(() => {
-      utils.message(res,'操作成功',() => {
-        visible.value = false
-        emit('onSuccess')
-        bindData.value = {}
-        upload.value.refresh()
-        loading.value = false
-      })
-    })
-  } else {
-    utils.message(res,'操作成功',() => {
-      visible.value = false
-      formRef.value.resetFields()
-      emit('onSuccess')
-      loading.value = false
-    })
-  }
+
+  utils.message(res,'操作成功',() => {
+    visible.value = false
+    formRef.value.resetFields()
+    emit('onSuccess')
+    loading.value = false
+  })
 }
 </script>
 <style>

src/MAR/assetsStore/modules/setClass/edit.vue

@@ -18,12 +18,17 @@
               <a-input v-model:value="form.classname" placeholder="请输入分类名称"></a-input>
             </a-form-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-item label="描述" name="remarks">
+              <a-input v-model:value="form.remarks" placeholder="请输入描述"></a-input>
+            </a-form-item>
+          </a-col>
           <a-col :span="24">
             <a-form-item label="排序" name="sequence">
               <a-input v-model:value="form.sequence" placeholder="请输入排序"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :span="24" v-if="data.parentid == 0">
+          <!-- <a-col :span="24" v-if="data.parentid == 0">
             <a-form-item label="封面图" name="attinfos" :rules="[{ required: true, message: '请选择封面',trigger:'change'}]">
               <Upload 
                 :bindData="bindData"
@@ -34,7 +39,7 @@
               ></Upload>
               <p style="color:#b8b3b3">注：建议上传图片大小130x80像素，大小不超过2M，格式为JPG/PNG</p>
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <a-col :span="24">
             <a-form-item label="状态" name="isenable">
               <a-switch
@@ -95,7 +100,7 @@ const showDrawer = ()=>{
 const formRef = ref()
 
 const submit = async () => {
-  if (props.data.parentid == 0 && upload.value.fileList.length == 0) form.value.attinfos = ''
+  // if (props.data.parentid == 0 && upload.value.fileList.length == 0) form.value.attinfos = ''
   const values = await formRef.value.validateFields()
   let res = await Api.requested( {
     "id": "20240403132302",

src/MAR/extendManage/detail/modules/extendList/Add.vue

@@ -42,17 +42,14 @@
 
                 <a-card title="上传广告图" :bordered="false" style="margin-bottom: 10px;">
                   <a-form-item label="图片" name="attinfos" :rules="[{ required: true, message: '请选择图片',trigger:'change'}]">
-                    <previewImage v-if="form.attinfos.length && form.attinfos !== 1" :images="form.attinfos" @deleteSuccess="form.attinfos=''"></previewImage>
-                      <upload 
-                        v-else
-                        accept="image/png, image/jpeg"
-                        btntype="image"
-                        modeType="modal" 
-                        @fileChange="form.attinfos=1"
-                        style="margin-bottom:10px" 
+                      <Upload 
                         :bindData="{ownerid:form.sys_adid,ownertable:'sys_ad',usetype:'default'}" 
                         @uploadSuccess="uploadSuccess"
-                      ></upload>
+                        @fileChange="form.attinfos='1'"  
+                        accept="image/*"
+                        :multiple="false"
+                        ref="upload"
+                      ></Upload>
                       <p style="color:#b8b3b3">注：建议上传图片大小130x80像素，大小不超过2M，格式为JPG/PNG</p>
                     </a-form-item>
                 </a-card>
@@ -258,7 +255,7 @@ import Api from '@/api/api'
 import utils from '@/utils/utils'
 import { message, Modal } from 'ant-design-vue';
 import { useRouter } from "vue-router";
-import upload from '@/components/upload/index.vue'
+import Upload from '@/MAR/assetsStore/detail/fileUpload.vue'
 import previewImage from '@/components/previewImage/index.vue'
 import normalTable from '@/template/normalTable/index.vue'
 import SelectModel from '@/components/selectModel/index2.vue'

src/MAR/imgTextManage/detail/modules/Add.vue

@@ -13,7 +13,7 @@
       <a-form ref="formRef" :model="form" layout="vertical">
         <a-row>
           <a-col :span="24">
-            <a-form-item label="封面图" name="attinfos" :rules="[{ required: true, message: '请选择图片',trigger:'change'}]">
+            <a-form-item label="上传图片" name="attinfos" :rules="[{ required: true, message: '请选择图片',trigger:'change'}]">
               <Upload 
                 :bindData="{ownerid:router.currentRoute.value.query.id,ownertable:'sat_sharematerial',usetype:'img'}"
                 @fileChange="form.attinfos='1';loading=true"  

src/MAR/imgTextManage/detail/modules/Edit.vue

@@ -13,7 +13,7 @@
       <a-form ref="formRef" :model="form" layout="vertical">
         <a-row>
           <a-col :span="24">
-            <a-form-item label="封面图" name="attinfos" :rules="[{ required: true, message: '请选择图片',trigger:'change'}]">
+            <a-form-item label="上传图片" name="attinfos" :rules="[{ required: true, message: '请选择图片',trigger:'change'}]">
               <Upload 
                 :bindData="{ownerid:router.currentRoute.value.query.id,ownertable:'sat_sharematerial',usetype:'img'}"
                 @fileChange="form.attinfos='1';loading=true"  

src/MAR/imgTextManage/modules/Add.vue

@@ -13,14 +13,13 @@
           <a-col :span="24">
             <a-form-item label="底部样式" name="style_bottom">
               <a-select v-model:value="form.style_bottom" placeholder="请选择底部样式">
-                <a-select-option value="黑色">黑色</a-select-option>
-                <a-select-option value="白色">白色</a-select-option>
+                <a-select-option :value="item.value" v-for="(item,index) in bottomstyle" :key="index">{{ item.remarks }}</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
           <a-col :span="24">
-            <a-form-item label="预约报名样式" name="style_signup">
-              <a-select v-model:value="form.style_signup" placeholder="请选择报名样式">
+            <a-form-item label="长图文类型" name="style_signup" :rules="[{ required: true, message: '请选择长图文类型',trigger:'change'}]">
+              <a-select v-model:value="form.style_signup" placeholder="请选择长图文类型">
                 <a-select-option :value="item.value" v-for="(item,index) in appointmenttypeOption" :key="index">{{ item.remarks }}</a-select-option>
               </a-select>
             </a-form-item>
@@ -167,9 +166,13 @@ const uploadSuccess = async (res) => {
   form.value.attinfos = JSON.parse(res.attinfos).data
 }
 let appointmenttypeOption = ref([])
+let bottomstyle = ref([])
 onMounted(async() => {
   const res = await Api.optionstype('appointmenttype')
   appointmenttypeOption.value = res.data
+
+  const res2 = await Api.optionstype('bottomstyle')
+  bottomstyle.value = res2.data
 })
 </script>
 

src/MAR/imgTextManage/modules/Edit.vue

@@ -13,14 +13,13 @@
           <a-col :span="24">
             <a-form-item label="底部样式" name="style_bottom">
               <a-select v-model:value="form.style_bottom" placeholder="请选择底部样式">
-                <a-select-option value="黑色">黑色</a-select-option>
-                <a-select-option value="白色">白色</a-select-option>
+                <a-select-option :value="item.value" v-for="(item,index) in bottomstyle" :key="index">{{ item.remarks }}</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
           <a-col :span="24">
-            <a-form-item label="预约报名样式" name="style_signup">
-              <a-select v-model:value="form.style_signup" placeholder="请选择报名样式">
+            <a-form-item label="长图文类型" name="style_signup" :rules="[{ required: true, message: '请选择长图文类型',trigger:'change'}]">
+              <a-select v-model:value="form.style_signup" placeholder="请选择长图文类型">
                 <a-select-option :value="item.value" v-for="(item,index) in appointmenttypeOption" :key="index">{{ item.remarks }}</a-select-option>
               </a-select>
             </a-form-item>
@@ -94,6 +93,8 @@ let upload = ref()
 //新建
 const addClass = async () => {
   form.value = Object.assign({}, form.value, props.rowData)
+  form.value.style_bottom = form.value.sharepagecontrol.style_bottom
+  form.value.style_signup = form.value.sharepagecontrol.style_signup
   modeVisible.value = true
   nextTick(() => {
     upload.value.fileList = form.value.attinfos.filter(item => item.usetype=='avatar')
@@ -120,9 +121,13 @@ const uploadSuccess = async (res) => {
 }
 
 let appointmenttypeOption = ref([])
+let bottomstyle = ref([])
 onMounted(async() => {
   const res = await Api.optionstype('appointmenttype')
   appointmenttypeOption.value = res.data
+
+  const res2 = await Api.optionstype('bottomstyle')
+  bottomstyle.value = res2.data
 })
 </script>
 

src/MAR/itemsManage/index.vue

@@ -14,7 +14,7 @@
         <span :style="{color:utils.statusAndColor(data.record.isonsale?'上架':'下架')}">{{ data.record.isonsale?'上架':'下架' }}</span>
       </template>
       <template v-if="data.column.dataIndex === 'canadjust'">
-        <span>{{ data.record.isonsale?'允许':'禁止' }}</span>
+        <span>{{ data.record.canadjust?'允许':'禁止' }}</span>
       </template>
     </template>
   </listTemp>

src/MAR/itemsManage/modules/Add.vue

@@ -14,7 +14,7 @@
       <a-row :gutter="16">
         <a-col :span="10">
             <a-row>
-              <a-card title="设置课程" :bordered="false" style="margin-bottom: 10px;">
+              <a-card title="设置商品" :bordered="false" style="margin-bottom: 10px;">
                 <a-form ref="formRef" :model="form" layout="vertical">
                   <a-row>
                     <a-col :span="24">

src/MAR/itemsManage/modules/Edit.vue

@@ -14,7 +14,7 @@
       <a-row :gutter="16">
         <a-col :span="10">
             <a-row>
-              <a-card title="设置课程" :bordered="false" style="margin-bottom: 10px;">
+              <a-card title="设置商品" :bordered="false" style="margin-bottom: 10px;">
                 <a-form ref="formRef" :model="form" layout="vertical">
                   <a-row>
                     <a-col :span="24">

src/MAR/orderManage_sale/detail/Edit.vue

@@ -0,0 +1,85 @@
+<template>
+  <a-button @click="addClass" :disabled="props.disabled" type="primary" size="samll">编辑</a-button>
+  <a-drawer
+    ref="drawer"
+    v-model:open="modeVisible"
+    placement="right"
+    :width="'800px'"
+    :closable="false"
+    title="编辑"
+    >
+      <a-form ref="formRef" :model="form" layout="vertical">
+        <a-row>
+          <a-col :span="24">
+            <a-form-item label="订单日志" name="remarks">
+              <a-textarea :rows="6" v-model:value="form.remarks" placeholder="请输入日志" allow-clear />
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+      <template #extra>
+        <a-space>
+          <a-button type="primary" @click="submit">保存</a-button>
+        </a-space>
+      </template>
+  </a-drawer>
+  
+</template>
+
+<script setup>
+import {ref, defineProps, defineEmits,watch, nextTick, onMounted, inject} from 'vue'
+import Api from '@/api/api'
+import utils from '@/utils/utils'
+import { message, Modal } from 'ant-design-vue';
+import { useRouter } from "vue-router";
+import { useAuthStore } from '@/stores/modules/auth'
+
+let classArr = inject('classArr')
+const router = useRouter()
+let emit = defineEmits(['back','onSuccess'])
+let props = defineProps(['disabled','rowData'])
+let formRef = ref()
+let modeVisible = ref(false)
+let form = ref({
+  "sa_custorderid": 0,
+  "remarks":""
+})
+
+
+
+//新建
+const addClass = async () => {
+  modeVisible.value = true
+  // form.value = Object.assign({}, form.value, props.rowData)
+  form.value.sa_custorderid = props.rowData.sa_custorderid
+  form.value.remarks = props.rowData.remarks
+}
+
+
+let table = ref()
+//保存
+const submit = async () => {
+  const values = await formRef.value.validateFields()
+  const res = await Api.requested({
+    "id": "20240429152802",
+    "content": form.value
+  })
+  utils.message(res,'保存成功',async () => {
+    emit('onSuccess')
+    modeVisible.value = false
+  })
+}
+
+onMounted(async() => {
+
+})
+</script>
+
+<style scoped>
+.ant-select {
+  width:100%;
+}
+.ant-divider {
+  margin-top: 0 !important;
+}
+</style>

src/MAR/orderManage_sale/detail/index.vue

@@ -0,0 +1,102 @@
+<template>
+  <div>
+    <detail-template 
+      :headData="mainAreaData" 
+      :title="mainData.sonum" 
+      :tabs="['详细信息']" 
+      ownertable="sa_custorder"
+      >
+      <template #operation>
+        <Edit :rowData="mainData" @onSuccess="mianData()"></Edit>
+      </template>
+      <template #customContent>
+        <a-descriptions :column="6" :colon="false" :labelStyle="{display:'block',lineHeight:'25px',color:'#666',width:'80px',textAlignLast:'justify'}"  size="small">
+          <a-descriptions-item :span="2">
+            <template #label>
+              <div style="display: flex">
+                <span style="display: block;text-align-last: justify;width: 70px;transform: translateY(50%);">封面</span>
+              </div>
+            </template>
+            <a-image v-if="mainData.attinfos && mainData.attinfos.length" :src=" mainData.attinfos[0].fileType=='video' ? mainData.attinfos[0].subfiles[0].url:mainData.attinfos[0].url" style="width:100px"></a-image>
+          </a-descriptions-item>
+        </a-descriptions>
+      </template>
+      <template #tab0>
+        <span class="normal-title" style="margin-bottom: 10px">基本信息</span>
+        <defaultInfo :data="baseInfo">
+          <template #封面图>
+            <a-image v-if="mainData.attinfos && mainData.attinfos.length" :src="mainData.attinfos[0].url" style="width:100px"></a-image>
+          </template>
+        </defaultInfo>
+        <span class="normal-title" style="margin: 10px 0">系统信息</span>
+        <defaultInfo :data="systemInfo"></defaultInfo>
+      </template>
+    </detail-template>
+  </div>
+</template>
+
+<script setup>
+import Api from '@/api/api'
+import utils  from '@/utils/utils'
+import detailTemplate from '@/components/detailTemplate/index.vue'
+import defaultInfo from '@/template/defaultInfo/index.vue'
+import customBtn from '@/components/customHandleBtn/index.vue'
+import Edit from './Edit.vue'
+
+import { useRouter } from "vue-router";
+import {ref,defineProps,createVNode, defineComponent,onMounted, provide, nextTick} from 'vue'
+import { log } from '@antv/g2plot/lib/utils'
+const router = useRouter()
+const mainAreaData = ref([])
+const mainData = ref({})
+let baseInfo = ref([])
+let systemInfo = ref([])
+const mianData = async ()=>{
+  const res = await Api.requested({
+    "id": "20240429152602",
+    "content": {
+        "sa_custorderid": router.currentRoute.value.query.id
+    }
+  })
+  res.data.attinfos = utils.fileList(res.data.attinfos)
+  mainData.value = res.data
+  console.log(mainData.value);
+  changeDataStructure(res.data)
+
+  baseInfo.value = [
+    {label:'订单编号',value:mainData.value.sonum},
+    {label:'商品名称',value:mainData.value.itemname},
+    {label:'类型',value:mainData.value.pricetype},
+    {label:'金额（元）',value:utils.formatAmount(mainData.value.price)},
+    {label:'微信支付订单号',value:mainData.value.transaction_id},
+    {label:'微信支付流水号',value:mainData.value.out_trade_no},
+    {label:'来源经销商',value:mainData.value.enterprisename},
+    {label:'状态',value:mainData.value.status},
+    {label:'客户名称',value:mainData.value.name},
+    {label:'客户电话',value:mainData.value.phonenumber},
+    {label:'收货人姓名',value:mainData.value.delivery_name},
+    {label:'收货人电话',value:mainData.value.delivery_phonenumber},
+    {label:'收货地址',value:mainData.value.province+mainData.value.city+mainData.value.county+mainData.value.address},
+    {label:'订单日志',value:mainData.value.remarks},
+    {label:'封面图',value:'custom'},
+  ]
+  systemInfo.value = [
+    {label:'创建人',value:mainData.value.createby},
+    {label:'创建时间',value:mainData.value.createdate},
+    {label:'最近编辑人',value:mainData.value.changeby},
+    {label:'最近编辑时间',value:mainData.value.changedate},
+    {label:'付款时间',value:mainData.value.paytime},
+  ]
+}
+
+const changeDataStructure = (data) => {
+  mainAreaData.value = utils.FormLayout('detailsHead',data)
+}
+
+
+onMounted (()=>{
+  mianData()
+})
+</script>
+<style>
+</style>

src/MAR/orderManage_sale/index.vue

@@ -0,0 +1,40 @@
+<template>
+  <listTemp ref="list" keyRouteName="sonum" :param="param" tableName="orderTable" :searchType="searchType" :detailPage="{name:'orderManage_saleDetail',idname:'sa_custorderid'}">
+    <template #operation>
+    </template>
+    <template #tb_cell="{data}">
+      <template v-if="data.column.dataIndex === 'price'">
+        {{ utils.formatAmount(data.record.price) }}
+      </template>
+    </template>
+  </listTemp>
+</template>
+<script setup>
+import listTemp from '@/components/listTemplate/index.vue';
+import { ref,onMounted, nextTick, provide, reactive } from 'vue'
+import { useRouter } from "vue-router";
+import utils from '@/utils/utils'
+const list = ref()
+
+let searchType = ref([
+  {label:'状态',key:'status',type:'select',dataSource:[{remarks:'全部',value:''},{remarks:'待付款',value:'待付款'},{remarks:'已付款',value:'已付款'}]},
+  {label:'类型',key:'pricetype',type:'select',dataSource:[{remarks:'全部',value:''},{remarks:'一口价',value:'一口价'},{remarks:'阶梯价',value:'阶梯价'}]},
+  {label:'创建时间',key:'dateRange',type:'datepickerRange',objKeys:['begindate_create','enddate_create']},
+  {label:'搜索',key:'condition',type:'input'},
+])
+let param = ref({
+  "id": 20240429152902,
+  "content": {
+    "where": {
+      "condition": "",
+      "status": "",
+      "pricetype":"",
+      "begindate_create":"",
+      "enddate_create":""
+    }
+  },
+})
+</script>
+<style scoped>
+
+</style>

src/MAR/productManage/modules/setClass/add.vue

@@ -18,16 +18,21 @@
               <a-input v-model:value="form.classname" placeholder="请输入分类名称"></a-input>
             </a-form-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-item label="描述" name="remarks">
+              <a-input v-model:value="form.remarks" placeholder="请输入描述"></a-input>
+            </a-form-item>
+          </a-col>
           <a-col :span="24">
             <a-form-item label="排序" name="sequence">
               <a-input v-model:value="form.sequence" placeholder="请输入排序"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :span="24" v-if="!props.data">
+          <!-- <a-col :span="24" v-if="!props.data">
             <a-form-item label="封面图" name="attinfos">
               <Upload ref="upload" :multiple="false" :bindData="bindData" accept="image/*" @fileChange="form.attinfos='1'"></Upload>
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <a-col :span="24">
             <a-form-item label="状态" name="isenable">
               <a-switch
@@ -71,7 +76,8 @@ const form = ref({
   "isenable": 0,
   "parentid": 0,
   "sequence": 0,
-  "attinfos":''
+  "attinfos":'',
+  "remarks":''
 })
 const showDrawer = ()=>{
   if (props.data) form.value.isenable = props.data.isenable
@@ -98,7 +104,7 @@ const submit = async () => {
         visible.value = false
         emit('onSuccess')
         bindData.value = {}
-        upload.value.refresh()
+        // upload.value.refresh()
         loading.value = false
       })
     })

src/MAR/productManage/modules/setClass/edit.vue

@@ -18,16 +18,21 @@
               <a-input v-model:value="form.classname" placeholder="请输入分类名称"></a-input>
             </a-form-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-item label="描述" name="remarks">
+              <a-input v-model:value="form.remarks" placeholder="请输入描述"></a-input>
+            </a-form-item>
+          </a-col>
           <a-col :span="24">
             <a-form-item label="排序" name="sequence">
               <a-input v-model:value="form.sequence" placeholder="请输入排序"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :span="24" v-if="data.parentid == 0">
+          <!-- <a-col :span="24" v-if="data.parentid == 0">
             <a-form-item label="封面图" name="attinfos">
               <Upload ref="upload" :multiple="false" @deleteSuccess="$refs.upload.fileList=[]" :bindData="bindData" accept="image/*" @fileChange="form.attinfos='1';"></Upload>
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <a-col :span="24">
             <a-form-item label="状态" name="isenable">
               <a-switch
@@ -71,7 +76,8 @@ const form = ref({
   "isenable": 0,
   "parentid": 0,
   "sequence": 0,
-  "attinfos":''
+  "attinfos":'',
+  "remarks":''
 })
 
 watch(() => visible.value,(val) => {
@@ -94,7 +100,7 @@ const showDrawer = ()=>{
 const formRef = ref()
 
 const submit = async () => {
-  if (props.data.parentid == 0 && upload.value.fileList.length == 0) form.value.attinfos = ''
+  // if (props.data.parentid == 0 && upload.value.fileList.length == 0) form.value.attinfos = ''
   const values = await formRef.value.validateFields()
   let res = await Api.requested( {
     "id": "20240418111802",

src/MAR/signManage/modules/Edit.vue

@@ -10,21 +10,6 @@
       >
         <a-form ref="formRef" :model="form" layout="vertical">
           <a-row :gutter="16">
-            <!-- <a-col :span="24">
-              <a-form-item label="类型" name="type" :rules="[{ required: true, message: '请选择类型',trigger:'change'}]">
-                <a-select
-                  :disabled="true"
-                  ref="select"
-                  v-model:value="form.type"
-                  placeholder="选择类型"
-                  style="width: 150px"
-                  @change="typeChange"
-                >
-                  <a-select-option :value="1">图片</a-select-option>
-                  <a-select-option :value="2">视频</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col> -->
             <a-col :span="24">
               <a-form-item label="描述" name="notes">
                 <a-textarea v-model:value="form.notes" placeholder="输入描述" />
@@ -183,24 +168,6 @@
     }
   })
 
-  const typeChange = async () => {
-    if (upload.value.fileList.length) {
-      let res = await Api.requested({
-        "classname": "system.attachment.Attachment",
-        "method": "deleteFileLink",
-        "content": {
-          "linksids": upload.value.fileList.map(item => item.linksid)
-        }
-      })
-    }
-    upload.value.refresh()
-  }
-  
-  //文件上传成功
-  const fileUploadSuccess = (res) => {
-    form.value.attinfos = utils.fileList(JSON.parse(res.attinfos).data)
-    console.log(form.value.attinfos);
-  }
   const formRef = ref()
   const submit = async ()=>{
     try {

src/MAR/topiceManage/detail/index.vue

@@ -115,6 +115,7 @@ const mianData = async ()=>{
   })
   mainData.value = res.data
   mainData.value.attinfos.forEach(item => item.name = item.document)
+  mainData.value.attinfos = utils.fileList(mainData.value.attinfos)
   mainData.value.options.forEach((item,index) => {
     item.cover = [{url:item.url}]
     item.sequence = options[index]

src/MAR/topiceManage/modules/Add.vue

@@ -44,14 +44,13 @@
           </a-col>
           <a-col :span="24">
             <a-form-item label="图片" name="cover">
-              <!-- <Upload 
+              <Upload 
                 :bindData="bindData"
-                @uploadSuccess="uploadSuccess"
+                @fileChange="form.attinfos='1'"  
                 :multiple="true"
-                accept="image/png, image/jpeg"
+                accept="image/* , video/*"
                 ref="upload"
-              ></Upload> -->
-              <Upload ref="upload" :multiple="true" :bindData="bindData" accept="image/*" @fileChange="form.attinfos='1'"></Upload>
+              ></Upload>
             </a-form-item>
           </a-col>
         </a-row>
@@ -66,8 +65,7 @@
 </template>
 
 <script setup>
-// import Upload from '@/MAR/assetsStore/detail/fileUpload.vue'
-import Upload from '@/MAR/archivesMag/modules/workManage/fileUpload.vue'
+import Upload from '@/MAR/assetsStore/detail/fileUpload.vue'
 import {Cascader} from 'ant-design-vue'
 import {ref,defineEmits, watch, inject} from 'vue'
 import Api from '@/api/api'

src/MAR/topiceManage/modules/Edit.vue

@@ -44,7 +44,13 @@
           </a-col>
           <a-col :span="24">
             <a-form-item label="封面图" name="attinfos">
-              <Upload ref="upload" :multiple="true" :bindData="bindData" accept="image/*" @fileChange="form.attinfos='1'"></Upload>
+              <Upload 
+                :bindData="bindData"
+                @fileChange="form.attinfos='1'"  
+                :multiple="true"
+                accept="image/* , video/*"
+                ref="upload"
+              ></Upload>
             </a-form-item>
           </a-col>
         </a-row>
@@ -59,8 +65,8 @@
 </template>
 
 <script setup>
+import Upload from '@/MAR/assetsStore/detail/fileUpload.vue'
 import previewImage from '@/components/previewImage/index.vue'
-import Upload from '@/MAR/archivesMag/modules/workManage/fileUpload.vue'
 import {Cascader} from 'ant-design-vue'
 import {ref,defineEmits, watch, inject, nextTick} from 'vue'
 import Api from '@/api/api'

src/router/MAR.js

@@ -229,5 +229,25 @@ const Customized = [
     },
     component: () => import(/* webpackChunkName: "about" */ '@/MAR/itemsManage/detail/index.vue'),
   },
+  {
+    path: '/orderManage_sale',
+    name: 'orderManage_sale',
+    meta: {
+      title: '订单管理',
+      name: 'orderManage_sale',
+      keepAlive:true
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/MAR/orderManage_sale/index.vue'),
+  },
+  {
+    path: '/orderManage_saleDetail',
+    name: 'orderManage_saleDetail',
+    meta: {
+      title: '订单详情',
+      name: 'orderManage_sale',
+      keepAlive:true
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/MAR/orderManage_sale/detail/index.vue'),
+  },
 ]
 export default Customized;

src/utils/utils.js

@@ -234,6 +234,7 @@ export default {
       {st:'确认',cl:'#01352c'},
       {st:'复核',cl:'#ff9234'},
       {st:'启用',cl:"#1890ff"},
+      {st:'待付款',cl:'#f5222d'},
       {st:'停用',cl:'#acbdc5'},
       {st:'发布',cl:'#52c41a'},
       {st:'上架',cl:'#52c41a'},