shish 3 minggu lalu
induk
melakukan
507961776b

+ 61 - 60
ghsApp/src/admin/ghsNotice/add.vue

@@ -28,7 +28,7 @@
             <view class="input-box textarea-box">
             <view class="input-box textarea-box">
               <textarea
               <textarea
                 v-model="form.summary"
                 v-model="form.summary"
-                maxlength="70"
+                maxlength="80"
                 class="form-textarea"
                 class="form-textarea"
                 placeholder="请输入公告简介"
                 placeholder="请输入公告简介"
                 placeholder-class="placeholder"
                 placeholder-class="placeholder"
@@ -58,6 +58,7 @@
                 <text class="checkbox-text">{{ item.label }}</text>
                 <text class="checkbox-text">{{ item.label }}</text>
               </label>
               </label>
             </checkbox-group>
             </checkbox-group>
+            <text class="form-tip">同个位置有多个公告,每5秒轮播一条</text>
           </view>
           </view>
         </view>
         </view>
 
 
@@ -273,24 +274,24 @@ export default {
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 .app-content {
 .app-content {
   min-height: 100vh;
   min-height: 100vh;
-  padding: 24rpx 24rpx 0;
+  padding: 24upx 24upx 0;
   background: #f3f4f6;
   background: #f3f4f6;
   box-sizing: border-box;
   box-sizing: border-box;
 }
 }
 
 
 .form-card {
 .form-card {
   background: #fff;
   background: #fff;
-  border-radius: 20rpx;
-  padding: 32rpx 28rpx;
-  margin-bottom: 24rpx;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.04);
+  border-radius: 20upx;
+  padding: 32upx 28upx;
+  margin-bottom: 24upx;
+  box-shadow: 0 2upx 12upx rgba(0, 0, 0, 0.04);
 }
 }
 
 
 .card-title {
 .card-title {
-  font-size: 34rpx;
+  font-size: 34upx;
   font-weight: 600;
   font-weight: 600;
   color: #1a1a1a;
   color: #1a1a1a;
-  margin-bottom: 28rpx;
+  margin-bottom: 28upx;
 
 
   &.no-margin {
   &.no-margin {
     margin-bottom: 0;
     margin-bottom: 0;
@@ -300,7 +301,7 @@ export default {
 .form-item {
 .form-item {
   display: flex;
   display: flex;
   align-items: center;
   align-items: center;
-  margin-bottom: 28rpx;
+  margin-bottom: 28upx;
 
 
   &.align-top {
   &.align-top {
     align-items: flex-start;
     align-items: flex-start;
@@ -313,19 +314,19 @@ export default {
 
 
 .form-label {
 .form-label {
   flex-shrink: 0;
   flex-shrink: 0;
-  width: 168rpx;
-  font-size: 28rpx;
+  width: 168upx;
+  font-size: 28upx;
   color: #333;
   color: #333;
   font-weight: 500;
   font-weight: 500;
 }
 }
 
 
 .form-item:not(.align-top) .form-label {
 .form-item:not(.align-top) .form-label {
-  line-height: 80rpx;
+  line-height: 80upx;
 }
 }
 
 
 .form-item.align-top .form-label {
 .form-item.align-top .form-label {
   line-height: 1.4;
   line-height: 1.4;
-  padding-top: 4rpx;
+  padding-top: 4upx;
 }
 }
 
 
 .form-field {
 .form-field {
@@ -335,30 +336,30 @@ export default {
 
 
 .input-box {
 .input-box {
   background: #f5f6f8;
   background: #f5f6f8;
-  border-radius: 12rpx;
-  padding: 0 24rpx;
+  border-radius: 12upx;
+  padding: 0 24upx;
   position: relative;
   position: relative;
 
 
   &.textarea-box {
   &.textarea-box {
-    padding-top: 12rpx;
-    padding-bottom: 12rpx;
+    padding-top: 12upx;
+    padding-bottom: 12upx;
   }
   }
 }
 }
 
 
 .form-input {
 .form-input {
   width: 100%;
   width: 100%;
-  height: 80rpx;
-  font-size: 28rpx;
+  height: 80upx;
+  font-size: 28upx;
   color: #333;
   color: #333;
-  padding-right: 80rpx;
+  padding-right: 80upx;
   box-sizing: border-box;
   box-sizing: border-box;
 }
 }
 
 
 .form-textarea {
 .form-textarea {
   width: 100%;
   width: 100%;
-  min-height: 80rpx;
-  padding: 8rpx 80rpx 8rpx 0;
-  font-size: 28rpx;
+  min-height: 80upx;
+  padding: 8upx 80upx 8upx 0;
+  font-size: 28upx;
   color: #333;
   color: #333;
   line-height: 1.5;
   line-height: 1.5;
   box-sizing: border-box;
   box-sizing: border-box;
@@ -371,13 +372,13 @@ export default {
 .form-label.required::before {
 .form-label.required::before {
   content: '*';
   content: '*';
   color: #e64340;
   color: #e64340;
-  margin-right: 6rpx;
+  margin-right: 6upx;
 }
 }
 
 
 .char-count {
 .char-count {
   position: absolute;
   position: absolute;
-  right: 20rpx;
-  font-size: 22rpx;
+  right: 20upx;
+  font-size: 22upx;
   color: #999;
   color: #999;
   line-height: 1;
   line-height: 1;
 }
 }
@@ -388,21 +389,21 @@ export default {
 }
 }
 
 
 .textarea-box .char-count {
 .textarea-box .char-count {
-  bottom: 12rpx;
+  bottom: 12upx;
 }
 }
 
 
 .form-tip {
 .form-tip {
   display: block;
   display: block;
-  font-size: 22rpx;
+  font-size: 24upx;
   color: #999;
   color: #999;
-  padding: 10rpx 16rpx;
+  padding: 10upx 0upx;
   line-height: 1.4;
   line-height: 1.4;
 }
 }
 
 
 .position-grid {
 .position-grid {
   display: flex;
   display: flex;
   flex-wrap: wrap;
   flex-wrap: wrap;
-  gap: 24rpx 0;
+  gap: 24upx 0;
 }
 }
 
 
 .position-item {
 .position-item {
@@ -410,33 +411,33 @@ export default {
   display: flex;
   display: flex;
   align-items: center;
   align-items: center;
   box-sizing: border-box;
   box-sizing: border-box;
-  padding-right: 12rpx;
+  padding-right: 12upx;
 }
 }
 
 
 .checkbox-text {
 .checkbox-text {
-  font-size: 28rpx;
+  font-size: 28upx;
   color: #333;
   color: #333;
-  margin-left: 8rpx;
+  margin-left: 8upx;
 }
 }
 
 
 .content-card {
 .content-card {
-  padding-bottom: 24rpx;
+  padding-bottom: 24upx;
 }
 }
 
 
 .content-header {
 .content-header {
   display: flex;
   display: flex;
   align-items: center;
   align-items: center;
   justify-content: space-between;
   justify-content: space-between;
-  margin-bottom: 20rpx;
+  margin-bottom: 20upx;
 }
 }
 
 
 .content-tip {
 .content-tip {
-  font-size: 24rpx;
+  font-size: 24upx;
   color: #999;
   color: #999;
 }
 }
 
 
 .editor-wrap {
 .editor-wrap {
-  margin: 0 -28rpx;
+  margin: 0 -28upx;
 
 
   ::v-deep .rich-media-editor {
   ::v-deep .rich-media-editor {
     border: none;
     border: none;
@@ -445,23 +446,23 @@ export default {
   }
   }
 
 
   ::v-deep .content-area {
   ::v-deep .content-area {
-    min-height: 280rpx;
-    padding: 0 28rpx 40rpx;
+    min-height: 280upx;
+    padding: 0 28upx 40upx;
     background: #fff;
     background: #fff;
   }
   }
 
 
   ::v-deep .empty-placeholder {
   ::v-deep .empty-placeholder {
-    min-height: 280rpx;
+    min-height: 280upx;
     margin: 0;
     margin: 0;
     background: #f5f6f8;
     background: #f5f6f8;
-    border: 2rpx dashed #d9dce3;
-    border-radius: 16rpx;
+    border: 2upx dashed #d9dce3;
+    border-radius: 16upx;
     flex-direction: column;
     flex-direction: column;
-    gap: 16rpx;
+    gap: 16upx;
 
 
     &::before {
     &::before {
       content: '+';
       content: '+';
-      font-size: 56rpx;
+      font-size: 56upx;
       color: $mainColor;
       color: $mainColor;
       font-weight: 300;
       font-weight: 300;
       line-height: 1;
       line-height: 1;
@@ -470,23 +471,23 @@ export default {
 
 
   ::v-deep .empty-text {
   ::v-deep .empty-text {
     color: #999;
     color: #999;
-    font-size: 26rpx;
+    font-size: 26upx;
   }
   }
 
 
   ::v-deep .bottom-toolbar {
   ::v-deep .bottom-toolbar {
     height: auto;
     height: auto;
-    padding: 24rpx 28rpx 32rpx;
+    padding: 24upx 28upx 32upx;
     border-top: none;
     border-top: none;
     background: #fff;
     background: #fff;
-    gap: 20rpx;
+    gap: 20upx;
   }
   }
 
 
   ::v-deep .toolbar-btn {
   ::v-deep .toolbar-btn {
     flex: 1;
     flex: 1;
-    padding: 24rpx 0;
+    padding: 24upx 0;
     background: #eef8f1;
     background: #eef8f1;
-    border-radius: 16rpx;
-    gap: 12rpx;
+    border-radius: 16upx;
+    gap: 12upx;
 
 
     &:active {
     &:active {
       background: #dff0e4;
       background: #dff0e4;
@@ -495,13 +496,13 @@ export default {
 
 
   ::v-deep .toolbar-btn .btn-text {
   ::v-deep .toolbar-btn .btn-text {
     color: $mainColor;
     color: $mainColor;
-    font-size: 26rpx;
+    font-size: 26upx;
     font-weight: 500;
     font-weight: 500;
   }
   }
 }
 }
 
 
 .footer-placeholder {
 .footer-placeholder {
-  height: calc(140rpx + env(safe-area-inset-bottom));
+  height: calc(140upx + env(safe-area-inset-bottom));
 }
 }
 
 
 .footer-bar {
 .footer-bar {
@@ -511,24 +512,24 @@ export default {
   bottom: 0;
   bottom: 0;
   z-index: 999;
   z-index: 999;
   display: flex;
   display: flex;
-  padding: 20rpx 30rpx calc(20rpx + env(safe-area-inset-bottom));
+  padding: 20upx 30upx calc(20upx + env(safe-area-inset-bottom));
   background: #fff;
   background: #fff;
-  box-shadow: 0 -2rpx 16rpx rgba(0, 0, 0, 0.06);
+  box-shadow: 0 -2upx 16upx rgba(0, 0, 0, 0.06);
   box-sizing: border-box;
   box-sizing: border-box;
 }
 }
 
 
 .footer-btn {
 .footer-btn {
   flex: 1;
   flex: 1;
-  height: 88rpx;
-  line-height: 88rpx;
+  height: 88upx;
+  line-height: 88upx;
   margin: 0;
   margin: 0;
   padding: 0;
   padding: 0;
-  font-size: 32rpx;
-  border-radius: 20rpx;
+  font-size: 32upx;
+  border-radius: 20upx;
   border: none;
   border: none;
 
 
   &:first-child {
   &:first-child {
-    margin-right: 24rpx;
+    margin-right: 24upx;
   }
   }
 
 
   &::after {
   &::after {
@@ -537,7 +538,7 @@ export default {
 
 
   &.preview {
   &.preview {
     color: $mainColor;
     color: $mainColor;
-				border: 1rpx solid $mainColor;
+				border: 1upx solid $mainColor;
   }
   }
 
 
   &.submit {
   &.submit {

+ 59 - 59
ghsApp/src/admin/ghsNotice/list.vue

@@ -263,47 +263,47 @@ export default {
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 .app-content {
 .app-content {
   min-height: 100vh;
   min-height: 100vh;
-  padding-bottom: calc(140rpx + env(safe-area-inset-bottom));
+  padding-bottom: calc(140upx + env(safe-area-inset-bottom));
   background: #f3f4f6;
   background: #f3f4f6;
 }
 }
 
 
 .search-wrap {
 .search-wrap {
-  padding: 24rpx 24rpx 8rpx;
+  padding: 24upx 24upx 8upx;
   background: #f3f4f6;
   background: #f3f4f6;
 
 
   ::v-deep .app-search-module .map-search {
   ::v-deep .app-search-module .map-search {
-    border-radius: 20rpx;
-    box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
+    border-radius: 20upx;
+    box-shadow: 0 2upx 8upx rgba(0, 0, 0, 0.04);
   }
   }
 }
 }
 
 
 .list-wrap {
 .list-wrap {
-  padding: 16rpx 24rpx 24rpx;
-  min-height: 400rpx;
+  padding: 16upx 24upx 24upx;
+  min-height: 400upx;
 }
 }
 
 
 .list-loading-placeholder {
 .list-loading-placeholder {
-  min-height: 400rpx;
+  min-height: 400upx;
 }
 }
 
 
 .notice-card {
 .notice-card {
   background: #fff;
   background: #fff;
-  border-radius: 20rpx;
-  padding: 28rpx 28rpx 24rpx;
-  margin-bottom: 24rpx;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.04);
+  border-radius: 20upx;
+  padding: 28upx 28upx 24upx;
+  margin-bottom: 24upx;
+  box-shadow: 0 2upx 12upx rgba(0, 0, 0, 0.04);
 }
 }
 
 
 .card-top {
 .card-top {
   display: flex;
   display: flex;
   align-items: flex-start;
   align-items: flex-start;
   justify-content: space-between;
   justify-content: space-between;
-  gap: 20rpx;
+  gap: 20upx;
 }
 }
 
 
 .title {
 .title {
   flex: 1;
   flex: 1;
-  font-size: 34rpx;
+  font-size: 34upx;
   font-weight: 600;
   font-weight: 600;
   color: $fontColorMain;
   color: $fontColorMain;
   line-height: 1.4;
   line-height: 1.4;
@@ -313,21 +313,21 @@ export default {
   flex-shrink: 0;
   flex-shrink: 0;
   display: flex;
   display: flex;
   align-items: center;
   align-items: center;
-  gap: 6rpx;
-  font-size: 24rpx;
-  padding: 8rpx 18rpx;
-  border-radius: 24rpx;
+  gap: 6upx;
+  font-size: 24upx;
+  padding: 8upx 18upx;
+  border-radius: 24upx;
   white-space: nowrap;
   white-space: nowrap;
 
 
   &.active {
   &.active {
     color: $mainColor;
     color: $mainColor;
     border-color: $mainColor;
     border-color: $mainColor;
     background: #f0f0f0;
     background: #f0f0f0;
-				border: 1rpx solid $mainColor;
+				border: 1upx solid $mainColor;
     .status-dot {
     .status-dot {
       border-color: $mainColor;
       border-color: $mainColor;
       color: $mainColor;
       color: $mainColor;
-      font-size: 18rpx;
+      font-size: 18upx;
     }
     }
   }
   }
 
 
@@ -336,7 +336,7 @@ export default {
     background: #f0f0f0;
     background: #f0f0f0;
     .status-dot {
     .status-dot {
       color: #bfbfbf;
       color: #bfbfbf;
-      font-size: 18rpx;
+      font-size: 18upx;
     }
     }
   }
   }
 }
 }
@@ -344,30 +344,30 @@ export default {
 .position-row {
 .position-row {
   display: flex;
   display: flex;
   align-items: flex-start;
   align-items: flex-start;
-  margin-top: 24rpx;
-  gap: 16rpx;
+  margin-top: 24upx;
+  gap: 16upx;
 }
 }
 
 
 .position-label {
 .position-label {
   flex-shrink: 0;
   flex-shrink: 0;
-  font-size: 26rpx;
+  font-size: 26upx;
   color: #8c8c8c;
   color: #8c8c8c;
-  line-height: 48rpx;
+  line-height: 48upx;
 }
 }
 
 
 .position-tags {
 .position-tags {
   flex: 1;
   flex: 1;
   display: flex;
   display: flex;
   flex-wrap: wrap;
   flex-wrap: wrap;
-  gap: 12rpx;
+  gap: 12upx;
 }
 }
 
 
 .tag {
 .tag {
-  font-size: 24rpx;
+  font-size: 24upx;
   color: #4a7fd0;
   color: #4a7fd0;
   background: #eef4fc;
   background: #eef4fc;
-  padding: 8rpx 20rpx;
-  border-radius: 8rpx;
+  padding: 8upx 20upx;
+  border-radius: 8upx;
   line-height: 1.2;
   line-height: 1.2;
 }
 }
 
 
@@ -375,20 +375,20 @@ export default {
   display: flex;
   display: flex;
   align-items: center;
   align-items: center;
   justify-content: flex-start‌;
   justify-content: flex-start‌;
-  padding: 20rpx 0;
-  border-bottom: 1rpx solid #f5f5f5;
+  padding: 20upx 0;
+  border-bottom: 1upx solid #f5f5f5;
 }
 }
 
 
 .meta-left {
 .meta-left {
   display: flex;
   display: flex;
   align-items: center;
   align-items: center;
-  gap: 10rpx;
+  gap: 10upx;
 }
 }
 
 
 .meta-clock {
 .meta-clock {
-  width: 24rpx;
-  height: 24rpx;
-  border: 2rpx solid #bfbfbf;
+  width: 24upx;
+  height: 24upx;
+  border: 2upx solid #bfbfbf;
   border-radius: 50%;
   border-radius: 50%;
   position: relative;
   position: relative;
   flex-shrink: 0;
   flex-shrink: 0;
@@ -404,29 +404,29 @@ export default {
   }
   }
 
 
   &::before {
   &::before {
-    width: 2rpx;
-    height: 7rpx;
-    margin-left: -1rpx;
-    margin-top: -7rpx;
+    width: 2upx;
+    height: 7upx;
+    margin-left: -1upx;
+    margin-top: -7upx;
   }
   }
 
 
   &::after {
   &::after {
-    width: 2rpx;
-    height: 5rpx;
-    margin-left: -1rpx;
-    margin-top: -5rpx;
+    width: 2upx;
+    height: 5upx;
+    margin-left: -1upx;
+    margin-top: -5upx;
     transform: rotate(90deg);
     transform: rotate(90deg);
   }
   }
 }
 }
 
 
 .meta-text {
 .meta-text {
-  font-size: 24rpx;
+  font-size: 24upx;
   color: #999;
   color: #999;
 }
 }
 
 
 .meta-sort {
 .meta-sort {
-  margin-left: 20rpx;
-  font-size: 24rpx;
+  margin-left: 20upx;
+  font-size: 24upx;
   color: #999;
   color: #999;
 }
 }
 
 
@@ -434,19 +434,19 @@ export default {
   display: flex;
   display: flex;
   justify-content: flex-end;
   justify-content: flex-end;
   align-items: center;
   align-items: center;
-  gap: 16rpx;
-  margin-top: 24rpx;
+  gap: 16upx;
+  margin-top: 24upx;
 }
 }
 
 
 .action-btn {
 .action-btn {
   margin: 0;
   margin: 0;
-  padding: 0 28rpx;
-  height: 56rpx;
-  line-height: 54rpx;
-  font-size: 26rpx;
-  border-radius: 12rpx;
+  padding: 0 28upx;
+  height: 56upx;
+  line-height: 54upx;
+  font-size: 26upx;
+  border-radius: 12upx;
   background: #fff;
   background: #fff;
-  border: 1rpx solid #e0e0e0;
+  border: 1upx solid #e0e0e0;
   color: #666;
   color: #666;
 
 
   &::after {
   &::after {
@@ -483,21 +483,21 @@ export default {
   left: 0;
   left: 0;
   right: 0;
   right: 0;
   bottom: 0;
   bottom: 0;
-  padding: 20rpx 30rpx calc(20rpx + env(safe-area-inset-bottom));
+  padding: 20upx 30upx calc(20upx + env(safe-area-inset-bottom));
   background: #fff;
   background: #fff;
-  box-shadow: 0 -2rpx 16rpx rgba(0, 0, 0, 0.06);
+  box-shadow: 0 -2upx 16upx rgba(0, 0, 0, 0.06);
 }
 }
 
 
 .footer-btn {
 .footer-btn {
   width: 100%;
   width: 100%;
-  height: 88rpx;
-  line-height: 88rpx;
+  height: 88upx;
+  line-height: 88upx;
   margin: 0;
   margin: 0;
   padding: 0;
   padding: 0;
-  font-size: 32rpx;
+  font-size: 32upx;
   color: #fff;
   color: #fff;
   background: $mainColor;
   background: $mainColor;
-  border-radius: 22rpx;
+  border-radius: 22upx;
   border: none;
   border: none;
 
 
   &::after {
   &::after {

+ 7 - 8
ghsApp/src/admin/ghsNotice/preview.vue

@@ -2,8 +2,7 @@
   <view class="preview-page">
   <view class="preview-page">
     <view class="page-header">
     <view class="page-header">
       <view class="header-content">
       <view class="header-content">
-        <text class="page-title">{{ title || '公告详情' }}</text>
-        <text class="page-summary" v-if="summary">{{ summary }}</text>
+        <text class="page-title">{{ title || '公告' }}</text>
       </view>
       </view>
     </view>
     </view>
     <view class="preview-content">
     <view class="preview-content">
@@ -77,21 +76,21 @@ export default {
 }
 }
 
 
 .page-header {
 .page-header {
-  padding: 30rpx;
-  border-bottom: 1rpx solid #eee;
+  padding: 30upx;
+  border-bottom: 1upx solid #eee;
 }
 }
 
 
 .page-title {
 .page-title {
   display: block;
   display: block;
-  font-size: 36rpx;
+  font-size: 36upx;
   font-weight: bold;
   font-weight: bold;
   color: #333;
   color: #333;
 }
 }
 
 
 .page-summary {
 .page-summary {
   display: block;
   display: block;
-  margin-top: 16rpx;
-  font-size: 28rpx;
+  margin-top: 16upx;
+  font-size: 28upx;
   color: #666;
   color: #666;
   line-height: 1.6;
   line-height: 1.6;
   white-space: pre-line;
   white-space: pre-line;
@@ -99,6 +98,6 @@ export default {
 }
 }
 
 
 .preview-content {
 .preview-content {
-  padding: 20rpx 0;
+  padding: 20upx 0;
 }
 }
 </style>
 </style>

+ 1 - 1
hdApp/src/pagesPurchase/ghsProduct.vue

@@ -19,7 +19,7 @@
 					vertical
 					vertical
 					:autoplay="ghsNoticeList.length > 1"
 					:autoplay="ghsNoticeList.length > 1"
 					:circular="ghsNoticeList.length > 1"
 					:circular="ghsNoticeList.length > 1"
-					:interval="4000"
+					:interval="5300"
 					:duration="400"
 					:duration="400"
 					:skip-hidden-item-layout="true"
 					:skip-hidden-item-layout="true"
 					@change="onGhsNoticeChange"
 					@change="onGhsNoticeChange"