Merge branch 'master' of http://git.yujin.shuziyunyao.com/yujin/digital-medicine-front

.env.production

@@ -38,3 +38,8 @@ VITE_APP_WEBSOCKET = false
 VITE_APP_SSE = true
 
 PACKAGE_SHARE_URL = 'https://www.shuziyunyao.com/dm/package'
+
+PACKAGE_SHARE_URL = 'https://www.shuziyunyao.com/dm/package'
+
+# appid
+VITE_APP_APPID = '1890328853823459329'

pro-deploy.ps1

@@ -0,0 +1,8 @@
+$compress = @{
+  Path             = ".\dist\*"
+  CompressionLevel = "Fastest"
+  DestinationPath  = ".\dist\dist.zip"
+}
+Compress-Archive @compress
+scp ./dist/dist.zip root@10.0.0.69:/app/front/digital-medicine-front
+ssh root@10.0.0.69 "cd /app/front/digital-medicine-front && ./deploy.sh"

src/views/cdt/models/saleLog.vue

@@ -4,9 +4,9 @@
             <vxe-column type="seq" width="60" title="序号" align="center" />
             <vxe-column title="订单号" field="id" min-width="100" :formatter="colNoData" />
             <vxe-column title="企业名称" field="cpyName" min-width="100" :formatter="colNoData" />
-            <vxe-column title="会员级别" field="vipLevelDesc" width="100" :formatter="colNoData" />
+            <vxe-column title="会员级别" field="vipLevelName" width="100" :formatter="colNoData" />
             <vxe-column title="缴费金额" width="120" :formatter="colNoData">
-                <template #default="{ row }">{{ row.paymentAmount }}元</template>
+                <template #default="{ row }">{{ row.totalAmount }}元</template>
             </vxe-column>
             <vxe-column title="邮箱" field="email" min-width="100" :formatter="colNoData" />
             <vxe-column title="缴费人" field="createName" min-width="100" :formatter="colNoData" />

src/views/dgtmedicine/news/medicinenews/noticeAdd.vue

@@ -77,8 +77,14 @@ const rules = reactive({
     newsTitle: [
         { required: true, message: '请输入标题', trigger: 'blur' }
     ],
-    content: [
-        { required: true, message: '请输入内容', trigger: 'blur' }
+    newsImg: [
+        { required: true, message: '请上传封面图片', trigger: 'blur' }
+    ],
+    publishTime: [
+        { required: true, message: '发布时间不为空', trigger: 'blur' }
+    ],
+    newsContent: [
+        { required: true, message: '请输入公告内容', trigger: 'blur' }
     ]
 });
 const formRef = ref();