Merge branch 'zhongqi-addGoods'

ghsApp/package.json

@@ -8,18 +8,10 @@
     "build:app-plus": "cross-env NODE_ENV=production UNI_PLATFORM=app-plus vue-cli-service uni-build",
     "build:custom": "cross-env NODE_ENV=production uniapp-cli custom",
     "build:h5": "cross-env NODE_ENV=production UNI_PLATFORM=h5 vue-cli-service uni-build",
-    "build:mp-alipay": "cross-env NODE_ENV=production UNI_PLATFORM=mp-alipay vue-cli-service uni-build",
-    "build:mp-baidu": "cross-env NODE_ENV=production UNI_PLATFORM=mp-baidu vue-cli-service uni-build",
-    "build:mp-qq": "cross-env NODE_ENV=production UNI_PLATFORM=mp-qq vue-cli-service uni-build",
-    "build:mp-toutiao": "cross-env NODE_ENV=production UNI_PLATFORM=mp-toutiao vue-cli-service uni-build",
     "build:mp-weixin": "cross-env NODE_ENV=production UNI_PLATFORM=mp-weixin vue-cli-service uni-build",
     "dev:app-plus": "cross-env NODE_ENV=development UNI_PLATFORM=app-plus vue-cli-service uni-build --watch",
     "dev:custom": "cross-env NODE_ENV=development uniapp-cli custom",
     "dev:h5": "cross-env NODE_ENV=development UNI_PLATFORM=h5 vue-cli-service uni-serve",
-    "dev:mp-alipay": "cross-env NODE_ENV=development UNI_PLATFORM=mp-alipay vue-cli-service uni-build --watch",
-    "dev:mp-baidu": "cross-env NODE_ENV=development UNI_PLATFORM=mp-baidu vue-cli-service uni-build --watch",
-    "dev:mp-qq": "cross-env NODE_ENV=development UNI_PLATFORM=mp-qq vue-cli-service uni-build --watch",
-    "dev:mp-toutiao": "cross-env NODE_ENV=development UNI_PLATFORM=mp-toutiao vue-cli-service uni-build --watch",
     "dev:mp-weixin": "cross-env NODE_ENV=development UNI_PLATFORM=mp-weixin vue-cli-service uni-build --watch --minimize",
     "info": "node node_modules/@dcloudio/vue-cli-plugin-uni/commands/info.js",
     "svgicon": "node ./src/uni_modules/zui-svg-icon/tools/generate-svg-icon.js"
@@ -29,18 +21,8 @@
     "@dcloudio/uni-app-plus": "2.0.2-4070520250711001",
     "@dcloudio/uni-h5": "2.0.2-4070520250711001",
     "@dcloudio/uni-helper-json": "*",
-    "@dcloudio/uni-mp-360": "2.0.2-4070520250711001",
-    "@dcloudio/uni-mp-alipay": "2.0.2-4070520250711001",
-    "@dcloudio/uni-mp-baidu": "2.0.2-4070520250711001",
-    "@dcloudio/uni-mp-harmony": "2.0.2-4070520250711001",
-    "@dcloudio/uni-mp-jd": "2.0.2-4070520250711001",
-    "@dcloudio/uni-mp-kuaishou": "2.0.2-4070520250711001",
-    "@dcloudio/uni-mp-lark": "2.0.2-4070520250711001",
-    "@dcloudio/uni-mp-qq": "2.0.2-4070520250711001",
-    "@dcloudio/uni-mp-toutiao": "2.0.2-4070520250711001",
     "@dcloudio/uni-mp-vue": "2.0.2-4070520250711001",
     "@dcloudio/uni-mp-weixin": "2.0.2-4070520250711001",
-    "@dcloudio/uni-mp-xhs": "2.0.2-4070520250711001",
     "@dcloudio/uni-quickapp-native": "2.0.2-4070520250711001",
     "@dcloudio/uni-quickapp-webview": "2.0.2-4070520250711001",
     "@dcloudio/uni-stacktracey": "2.0.2-4070520250711001",
@@ -55,7 +37,7 @@
     "regenerator-runtime": "^0.12.1",
     "text-encoding": "^0.7.0",
     "to-array-buffer": "^3.2.0",
-    "vue": "^2.6.10",
+    "vue": "2.6.14",
     "vue-lazyload": "^1.3.3",
     "vuex": "^3.6.2"
   },
@@ -79,7 +61,7 @@
     "jest": "^25.5.4",
     "mini-types": "*",
     "miniprogram-api-typings": "^2.8.0-2",
-    "moment": "^2.24.0",
+    "dayjs": "^1.11.10",
     "postcss": "^8.4.31",
     "postcss-comment": "^2.0.0",
     "postcss-import": "^15.1.0",

ghsApp/src/manifest.json

@@ -168,8 +168,6 @@
             }
         }
     },
-    /* 快应用特有相关 */
-    "quickapp" : {},
     /* 小程序特有相关 线上（销花宝） wxcf32b3f0684c2433 开发（花掌柜） wx21b7c3ef12082099 */
     "mp-weixin" : {
         "appid" : "wx21b7c3ef12082099",
@@ -187,15 +185,6 @@
         },
         "lazyCodeLoading":"requiredComponents"
     },
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
     "h5" : {
         "template" : "template.h5.html",
         "router" : {

ghsPad/package.json

@@ -46,7 +46,8 @@
     "to-array-buffer": "^3.2.0",
     "vue": "^2.6.10",
     "vue-lazyload": "^1.3.3",
-    "vuex": "^3.0.1"
+    "vuex": "^3.0.1",
+    "dayjs": "^1.11.10"
   },
   "devDependencies": {
     "@dcloudio/uni-automator": "^2.0.1-33920220121003",
@@ -69,7 +70,6 @@
     "jest": "^25.5.4",
     "mini-types": "*",
     "miniprogram-api-typings": "^2.8.0-2",
-    "moment": "^2.24.0",
     "postcss": "^7.0.0",
     "postcss-comment": "^2.0.0",
     "postcss-import": "^12.0.1",

hdApp/package.json

@@ -8,18 +8,10 @@
     "build:app-plus": "cross-env NODE_ENV=production UNI_PLATFORM=app-plus vue-cli-service uni-build",
     "build:custom": "cross-env NODE_ENV=production uniapp-cli custom",
     "build:h5": "cross-env NODE_ENV=production UNI_PLATFORM=h5 vue-cli-service uni-build",
-    "build:mp-alipay": "cross-env NODE_ENV=production UNI_PLATFORM=mp-alipay vue-cli-service uni-build",
-    "build:mp-baidu": "cross-env NODE_ENV=production UNI_PLATFORM=mp-baidu vue-cli-service uni-build",
-    "build:mp-qq": "cross-env NODE_ENV=production UNI_PLATFORM=mp-qq vue-cli-service uni-build",
-    "build:mp-toutiao": "cross-env NODE_ENV=production UNI_PLATFORM=mp-toutiao vue-cli-service uni-build",
     "build:mp-weixin": "cross-env NODE_ENV=production UNI_PLATFORM=mp-weixin vue-cli-service uni-build",
     "dev:app-plus": "cross-env NODE_ENV=development UNI_PLATFORM=app-plus vue-cli-service uni-build --watch",
     "dev:custom": "cross-env NODE_ENV=development uniapp-cli custom",
     "dev:h5": "cross-env NODE_ENV=development UNI_PLATFORM=h5 vue-cli-service uni-serve",
-    "dev:mp-alipay": "cross-env NODE_ENV=development UNI_PLATFORM=mp-alipay vue-cli-service uni-build --watch",
-    "dev:mp-baidu": "cross-env NODE_ENV=development UNI_PLATFORM=mp-baidu vue-cli-service uni-build --watch",
-    "dev:mp-qq": "cross-env NODE_ENV=development UNI_PLATFORM=mp-qq vue-cli-service uni-build --watch",
-    "dev:mp-toutiao": "cross-env NODE_ENV=development UNI_PLATFORM=mp-toutiao vue-cli-service uni-build --watch",
     "dev:mp-weixin": "cross-env NODE_ENV=development UNI_PLATFORM=mp-weixin vue-cli-service uni-build --watch",
     "info": "node node_modules/@dcloudio/vue-cli-plugin-uni/commands/info.js",
     "svgicon": "node ./src/uni_modules/zui-svg-icon/tools/generate-svg-icon.js"
@@ -29,20 +21,8 @@
     "@dcloudio/uni-app-plus": "2.0.2-4070520250711001",
     "@dcloudio/uni-h5": "2.0.2-4070520250711001",
     "@dcloudio/uni-helper-json": "*",
-    "@dcloudio/uni-mp-360": "2.0.2-4070520250711001",
-    "@dcloudio/uni-mp-alipay": "2.0.2-4070520250711001",
-    "@dcloudio/uni-mp-baidu": "2.0.2-4070520250711001",
-    "@dcloudio/uni-mp-harmony": "2.0.2-4070520250711001",
-    "@dcloudio/uni-mp-jd": "2.0.2-4070520250711001",
-    "@dcloudio/uni-mp-kuaishou": "2.0.2-4070520250711001",
-    "@dcloudio/uni-mp-lark": "2.0.2-4070520250711001",
-    "@dcloudio/uni-mp-qq": "2.0.2-4070520250711001",
-    "@dcloudio/uni-mp-toutiao": "2.0.2-4070520250711001",
     "@dcloudio/uni-mp-vue": "2.0.2-4070520250711001",
     "@dcloudio/uni-mp-weixin": "2.0.2-4070520250711001",
-    "@dcloudio/uni-mp-xhs": "2.0.2-4070520250711001",
-    "@dcloudio/uni-quickapp-native": "2.0.2-4070520250711001",
-    "@dcloudio/uni-quickapp-webview": "2.0.2-4070520250711001",
     "@dcloudio/uni-stacktracey": "2.0.2-4070520250711001",
     "@dcloudio/uni-stat": "2.0.2-4070520250711001",
     "@vue/shared": "3.5.18",
@@ -59,7 +39,8 @@
     "to-array-buffer": "^3.2.0",
     "vue": "^2.6.10",
     "vue-lazyload": "^1.3.3",
-    "vuex": "3.6.2"
+    "vuex": "3.6.2",
+    "dayjs": "^1.11.10"
   },
   "devDependencies": {
     "@dcloudio/uni-automator": "2.0.2-4070520250711001",
@@ -85,7 +66,6 @@
     "jest": "^25.5.4",
     "mini-types": "*",
     "miniprogram-api-typings": "^2.8.0-2",
-    "moment": "^2.24.0",
     "path-browserify": "^1.0.1",
     "postcss": "^8.4.31",
     "postcss-comment": "^2.0.0",

hdApp/src/admin/picText/picTextList.vue

@@ -8,7 +8,7 @@
               <view class="app-size-26 app-color-0" style="margin-right: 32upx">{{ item.id }}</view>
             </view>
             <view class="list-det" @click="edit(item.id)">
-              <view class="app-size-30 app-color-0" style="font-weight: bold">{{ item.title }}</view>
+              <view class="app-size-30 app-color-0" style="font-weight: bold; max-width: 420rpx; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">{{ item.title }}</view>
             </view>
 
             <view v-if="mode === 'selectPicText'">
@@ -45,7 +45,7 @@
 <script>
 import AppWrapperEmpty from '@/components/app-wrapper-empty';
 import { list } from '@/mixins';
-import { picTextList, picTextDel, UpdateCategoryId } from '@/api/pic-text';
+import { picTextDel, picTextList, UpdateCategoryId } from '@/api/pic-text';
 export default {
   name: 'picTextList',
   components: {

hdApp/src/manifest.json

@@ -149,8 +149,6 @@
             }
         }
     },
-    /* 快应用特有相关 */
-    "quickapp" : {},
     /* 小程序特有相关 线上（花掌柜） wx0d42f5f1dcb3a370 开发（花美玲） wxe4675bab299a52f7 */
     "mp-weixin" : {
         "appid" : "wxe4675bab299a52f7",
@@ -168,15 +166,6 @@
         },
         "lazyCodeLoading":"requiredComponents"
     },
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
     "h5" : {
         "template" : "template.h5.html",
         "router" : {

hdPad/package.json

@@ -46,7 +46,8 @@
     "to-array-buffer": "^3.2.0",
     "vue": "^2.6.10",
     "vue-lazyload": "^1.3.3",
-    "vuex": "^3.0.1"
+    "vuex": "^3.0.1",
+    "dayjs": "^1.11.10"
   },
   "devDependencies": {
     "@dcloudio/uni-automator": "^2.0.1-33920220121003",
@@ -69,7 +70,6 @@
     "jest": "^25.5.4",
     "mini-types": "*",
     "miniprogram-api-typings": "^2.8.0-2",
-    "moment": "^2.24.0",
     "postcss": "^7.0.0",
     "postcss-comment": "^2.0.0",
     "postcss-import": "^12.0.1",

jdApp/package.json

@@ -46,7 +46,8 @@
     "to-array-buffer": "^3.2.0",
     "vue": "^2.6.10",
     "vue-lazyload": "^1.3.3",
-    "vuex": "^3.0.1"
+    "vuex": "^3.0.1",
+    "dayjs": "^1.11.10"
   },
   "devDependencies": {
     "@dcloudio/uni-automator": "^2.0.1-33920220121003",
@@ -69,7 +70,6 @@
     "jest": "^25.5.4",
     "mini-types": "*",
     "miniprogram-api-typings": "^2.8.0-2",
-    "moment": "^2.24.0",
     "postcss": "^7.0.0",
     "postcss-comment": "^2.0.0",
     "postcss-import": "^12.0.1",

mallApp/package.json

@@ -8,18 +8,10 @@
     "build:app-plus": "cross-env NODE_ENV=production UNI_PLATFORM=app-plus vue-cli-service uni-build",
     "build:custom": "cross-env NODE_ENV=production uniapp-cli custom",
     "build:h5": "cross-env NODE_ENV=production UNI_PLATFORM=h5 vue-cli-service uni-build",
-    "build:mp-alipay": "cross-env NODE_ENV=production UNI_PLATFORM=mp-alipay vue-cli-service uni-build",
-    "build:mp-baidu": "cross-env NODE_ENV=production UNI_PLATFORM=mp-baidu vue-cli-service uni-build",
-    "build:mp-qq": "cross-env NODE_ENV=production UNI_PLATFORM=mp-qq vue-cli-service uni-build",
-    "build:mp-toutiao": "cross-env NODE_ENV=production UNI_PLATFORM=mp-toutiao vue-cli-service uni-build",
     "build:mp-weixin": "cross-env NODE_ENV=production UNI_PLATFORM=mp-weixin vue-cli-service uni-build",
     "dev:app-plus": "cross-env NODE_ENV=development UNI_PLATFORM=app-plus vue-cli-service uni-build --watch",
     "dev:custom": "cross-env NODE_ENV=development uniapp-cli custom",
     "dev:h5": "cross-env NODE_ENV=development UNI_PLATFORM=h5 vue-cli-service uni-serve",
-    "dev:mp-alipay": "cross-env NODE_ENV=development UNI_PLATFORM=mp-alipay vue-cli-service uni-build --watch",
-    "dev:mp-baidu": "cross-env NODE_ENV=development UNI_PLATFORM=mp-baidu vue-cli-service uni-build --watch",
-    "dev:mp-qq": "cross-env NODE_ENV=development UNI_PLATFORM=mp-qq vue-cli-service uni-build --watch",
-    "dev:mp-toutiao": "cross-env NODE_ENV=development UNI_PLATFORM=mp-toutiao vue-cli-service uni-build --watch",
     "dev:mp-weixin": "cross-env NODE_ENV=development UNI_PLATFORM=mp-weixin vue-cli-service uni-build --watch",
     "info": "node node_modules/@dcloudio/vue-cli-plugin-uni/commands/info.js",
     "svgicon": "node ./src/uni_modules/zui-svg-icon/tools/generate-svg-icon.js"
@@ -29,20 +21,8 @@
     "@dcloudio/uni-app-plus": "2.0.2-4070520250711001",
     "@dcloudio/uni-h5": "2.0.2-4070520250711001",
     "@dcloudio/uni-helper-json": "*",
-    "@dcloudio/uni-mp-360": "2.0.2-4070520250711001",
-    "@dcloudio/uni-mp-alipay": "2.0.2-4070520250711001",
-    "@dcloudio/uni-mp-baidu": "2.0.2-4070520250711001",
-    "@dcloudio/uni-mp-harmony": "2.0.2-4070520250711001",
-    "@dcloudio/uni-mp-jd": "2.0.2-4070520250711001",
-    "@dcloudio/uni-mp-kuaishou": "2.0.2-4070520250711001",
-    "@dcloudio/uni-mp-lark": "2.0.2-4070520250711001",
-    "@dcloudio/uni-mp-qq": "2.0.2-4070520250711001",
-    "@dcloudio/uni-mp-toutiao": "2.0.2-4070520250711001",
     "@dcloudio/uni-mp-vue": "2.0.2-4070520250711001",
     "@dcloudio/uni-mp-weixin": "2.0.2-4070520250711001",
-    "@dcloudio/uni-mp-xhs": "2.0.2-4070520250711001",
-    "@dcloudio/uni-quickapp-native": "2.0.2-4070520250711001",
-    "@dcloudio/uni-quickapp-webview": "2.0.2-4070520250711001",
     "@dcloudio/uni-stacktracey": "2.0.2-4070520250711001",
     "@dcloudio/uni-stat": "2.0.2-4070520250711001",
     "@vue/shared": "3.5.18",
@@ -58,7 +38,8 @@
     "to-array-buffer": "^3.2.0",
     "vue": "^2.6.10",
     "vue-lazyload": "^1.3.3",
-    "vuex": "^3.6.2"
+    "vuex": "^3.6.2",
+    "dayjs": "^1.11.10"
   },
   "devDependencies": {
     "@dcloudio/uni-automator": "2.0.2-4070520250711001",
@@ -82,7 +63,6 @@
     "jest": "25.5.4",
     "mini-types": "*",
     "miniprogram-api-typings": "^2.8.0-2",
-    "moment": "^2.24.0",
     "postcss": "^8.4.31",
     "postcss-comment": "^2.0.0",
     "postcss-import": "^15.1.0",

mallApp/src/pages/goods/detail.vue

@@ -78,6 +78,8 @@
           <rich-media-viewer
             ref="richMediaViewerCommon"
             :content="common_previewContent"
+            :startScroll="300"
+            :threshold="450"
           />
         </view>
       </view>
@@ -171,15 +173,15 @@ export default {
         this.data = res.data;
 
         //商品描述
-        this.title = res.data.picTextGoods.title || "";
+        this.title = res.data.picTextGoods && res.data.picTextGoods.title || "";
         // 字符串转换为数组
-        let content = res.data.picTextGoods.content || "";
+        let content = res.data.picTextGoods && res.data.picTextGoods.content || "[]";
         this.previewContent =
           typeof content === "string" ? JSON.parse(content) : content || [];
 
         //通用说明
-        this.common_title = res.data.picText.title || "";
-        content = res.data.picText.content || "";
+        this.common_title = res.data.picText && res.data.picText.title || "";
+        content = res.data.picText && res.data.picText.content || "[]";
         this.common_previewContent =
           typeof content === "string" ? JSON.parse(content) : content || [];
       });