Merge branch 'build' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into build

package.json

@@ -19,18 +19,15 @@
   ],
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
-    "@jiaminghi/c-render": "^0.4.3",
-    "@jiaminghi/charts": "^0.2.18",
     "@jiaminghi/data-view": "^2.10.0",
     "@logicflow/core": "^1.2.1",
     "bin-ace-editor": "^3.2.0",
     "dayjs": "^1.8.35",
-    "dui": "^2.0.0",
+    "dui": "file:ui",
     "echarts": "^5.1.2",
     "hash.js": "^1.1.7",
     "mp4box": "^0.4.1",
     "print-js": "^1.0.63",
-    "sass": "^1.56.1",
     "serialize-javascript": "^6.0.0",
     "sortablejs": "^1.12.0",
     "vue-draggable-resizable": "^2.3.0",
@@ -56,6 +53,7 @@
     "mockjs": "^1.1.0",
     "node-ipc": "^9.2.1",
     "readline": "^1.3.0",
+    "sass": "~1.32.6",
     "sass-loader": "^7.3.1",
     "uglifyjs-webpack-plugin": "^2.2.0",
     "v-viewer": "^1.6.4",
@@ -77,5 +75,8 @@
     "> 1%",
     "last 2 versions",
     "not ie <= 8"
-  ]
+  ],
+  "resolutions": {
+    "sass": "1.32.6"
+  }
 }

packages/bigscreen/designer/components/form/DataConfig.vue

@@ -149,7 +149,6 @@ import 'brace/mode/json'
 import 'brace/snippets/json';
 import 'brace/theme/github';
 import 'brace/theme/monokai';
-import AiEditor from "dui/packages/basic/AiEditor/AiEditor";
 
 export default {
   name: 'dataConfig',
@@ -191,7 +190,6 @@ export default {
   },
 
   components: {
-    AiEditor,
     CodeEditor
   },
 

project/fengdu/app/AppIntegratingSupermarket/AppIntegratingSupermarket.vue

@@ -17,7 +17,7 @@
 </template>
 
 <script>
-  import AddGoods from './components/AddGoods'
+  import AddGoods from './components/addGoods'
   import AddStore from './components/AddStore'
   import StoreList from './components/StoreList'
   import GoodsList from './components/GoodsList'

project/fengdu/app/AppIntegratingSupermarket/components/addGoods.vue

@@ -18,7 +18,7 @@
                 :selectList="dict.getDict('integralSGType')">
               </ai-select>
             </el-form-item>
-            <el-form-item  style="width: 100%" label="商品类型说明" prop="typeExplain"">
+            <el-form-item  style="width: 100%" label="商品类型说明" prop="typeExplain">
               <el-input type="input" size="small" v-model="form.typeExplain" clearable placeholder="请输入商品类型说明" maxlength="50" show-word-limit></el-input>
             </el-form-item>
             <el-form-item style="width: 100%" label="商品图片" prop="picUrl" :rules="[{required: true, message: '请选择商品图片', trigger: 'change'}]">