Przeglądaj źródła

Merge branch 'redesign‌-260706' of http://git.huaml.com/zhh/front-end into redesign‌-260706

ouyang 6 godzin temu
rodzic
commit
8a0153e9a8

+ 1 - 2
ghsApp/src/mixins/autoUpdate.js

@@ -31,8 +31,7 @@ export default {
                         return false
                     }
                     let that = this
-                    that.$util.confirmModal({content:updateText,title:'有新版本,请到应用市场更新',cancelText:'稍后',okText:'好的'},() => {
-                    })
+                    that.$util.confirmModal({content:updateText,title:'有新版本,请到应用市场更新',cancelText:'稍后',okText:'好的'},() => {})
                 }
             })
         },

+ 32 - 2
ghsApp/src/pagesClient/official/apply.vue

@@ -1,3 +1,8 @@
+<!--
+  供货商申请开店页
+  谁用:未注册用户在 ghsApp 提交批发店申请(审核通过后会同步开零售店)
+  解决问题:收集门店/申请人信息;可勾选「给零售店生成一套样例模板」,随申请落库供审核后复制
+-->
 <template>
   <view class="apply-page app-content">
     <form @submit="formSubmit">
@@ -53,6 +58,15 @@
               <input v-model="form.floor" type="text" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="floor" placeholder="选填" @input="modifyShow" />
             </tui-list-cell>
           </view>
+          <!-- 是否给同步创建的零售店复制样例模板;默认勾选,提交时以 genTemplate 传给 /apply/register -->
+          <view class="apply-agreement apply-template">
+            <checkbox-group @change="genTemplateItem">
+              <label class="apply-agreement-label">
+                <checkbox value="1" class="apply-checkbox" :checked="genTemplate == 1" />
+                <text class="apply-agreement-text">给零售店生成一套样例模板</text>
+              </label>
+            </checkbox-group>
+          </view>
         </view>
 
         <view class="apply-section">
@@ -188,6 +202,8 @@ export default {
     return {
       merchantData: {},
       agree:0,
+      // 默认勾选:审核通过后给同步创建的零售店复制一套样例模板
+      genTemplate: 1,
       form: {
         name: "",
         mobile: "",
@@ -450,6 +466,14 @@ export default {
 		agreeItem(e){
 			this.agree = e.detail.value && e.detail.value.length > 0 ? 1 : 0
 		},
+		/**
+		 * 样例模板勾选变更
+		 * 入参:checkbox-group 的 change 事件,detail.value 为已选中项数组
+		 * 返回:无;把 genTemplate 写成 1/0,落库后供平台审核通过时复制模板
+		 */
+		genTemplateItem(e){
+			this.genTemplate = e.detail.value && e.detail.value.length > 0 ? 1 : 0
+		},
     requestAuthCode(){
       let that = this
       let mobile = this.form.mobile
@@ -595,7 +619,8 @@ export default {
         style: this.option.style || 0,
         from: this.option.from || 0,
         miniOpenId:currentMiniOpenId,
-        fillMobile: this.fillMobile
+        fillMobile: this.fillMobile,
+        genTemplate: this.genTemplate
       }).then(res => {
         uni.hideLoading()
         this.$util.pageTo({
@@ -820,14 +845,19 @@ export default {
   padding: 0 8upx;
 }
 
+.apply-template {
+  margin-top: 8upx;
+}
+
 .apply-agreement-label {
   display: flex;
   flex-direction: row;
   align-items: center;
 }
 
+/* 勾选框在原 0.82 基础上放大 30%,便于点选与阅读 */
 .apply-checkbox {
-  transform: scale(0.82);
+  transform: scale(1.07);
   flex-shrink: 0;
 }
 

+ 32 - 1
ghsApp/tsconfig.json

@@ -1,10 +1,41 @@
 {
   "compilerOptions": {
+    "target": "ESNext",
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "allowJs": true,
+    "checkJs": false,
+    "noEmit": true,
+    "jsx": "preserve",
+    "paths": {
+      "@/*": [
+        "./src/*",
+        "./src/*.vue",
+        "./src/*/index.vue",
+        "./src/*/index.js"
+      ]
+    },
+    "lib": ["ESNext", "DOM"],
+    "skipLibCheck": true,
     "types": [
       "uni-app",
       "html5plus",
       "miniprogram-api-typings/types/lib.wx.api.d.ts",
       "mini-types/types/api"
     ]
+  },
+  "include": [
+    "src/**/*.js",
+    "src/**/*.ts",
+    "src/**/*.d.ts",
+    "src/**/*.vue"
+  ],
+  "exclude": [
+    "node_modules",
+    "dist",
+    "unpackage"
+  ],
+  "vueCompilerOptions": {
+    "target": 2.7
   }
-}
+}

+ 2 - 2
hdApp/package.json

@@ -27,6 +27,7 @@
     "@dcloudio/uni-stat": "2.0.2-4070520250711001",
     "@vue/shared": "3.5.18",
     "autoprefixer": "^10.4.16",
+    "dayjs": "^1.11.10",
     "echarts": "4.2.1",
     "flyio": "0.6.14",
     "js-base64": "^2.5.1",
@@ -39,8 +40,7 @@
     "to-array-buffer": "^3.2.0",
     "vue": "^2.6.10",
     "vue-lazyload": "^1.3.3",
-    "vuex": "3.6.2",
-    "dayjs": "^1.11.10"
+    "vuex": "3.6.2"
   },
   "devDependencies": {
     "@dcloudio/uni-automator": "2.0.2-4070520250711001",

+ 2 - 1
hdApp/src/admin/delivery/deliveryManage.vue

@@ -114,7 +114,8 @@ export default {
                 { id: 'shansong', name: '闪送', logo: '⚡'},
                 { id: 'didi', name: '滴滴', logo: '🚗'},
 		    	//{ id: 'uu', name: 'UU跑腿', logo: '🛵'},
-                { id: 'shunfeng', name: '顺丰同城', logo: '🚚'}
+                { id: 'shunfeng', name: '顺丰同城', logo: '🚚'},
+				{ id: 'dada', name: '达达', logo: '📦'}
 	    	];
 	
             // 获取已授权平台的id集合

+ 31 - 1
hdApp/src/pagesClient/official/apply.vue

@@ -1,3 +1,8 @@
+<!--
+  零售花店申请开店页
+  谁用:未注册用户在 hdApp 提交开店申请
+  解决问题:收集门店/注册人信息;可勾选「给零售店生成一套样例模板」,随申请提交给后端
+-->
 <template>
   <view class="apply-page app-content">
     <form @submit="formSubmit">
@@ -43,6 +48,16 @@
               <input v-model="form.floor" type="text" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="floor" placeholder="选填" @input="modifyShow" />
             </tui-list-cell>
           </view>
+
+          <!-- 是否给新开零售店复制样例模板;默认勾选,提交时以 genTemplate 传给 /apply/register -->
+          <view class="apply-agreement apply-template">
+            <checkbox-group @change="genTemplateItem">
+              <label class="apply-agreement-label">
+                <checkbox value="1" class="apply-checkbox" :checked="genTemplate == 1" />
+                <text class="apply-agreement-text">给零售店生成一套样例模板</text>
+              </label>
+            </checkbox-group>
+          </view>
         </view>
 
         <view class="apply-section">
@@ -185,6 +200,8 @@ export default {
     return {
       merchantData: {},
       agree:0,
+      // 默认勾选:给新开零售店复制一套首页/分类/场景/商品样例模板
+      genTemplate: 1,
       form: {
         name: "",
         mobile: "",
@@ -471,6 +488,14 @@ export default {
 		agreeItem(e){
 			this.agree = e.detail.value && e.detail.value.length > 0 ? 1 : 0
 		},
+		/**
+		 * 样例模板勾选变更
+		 * 入参:checkbox-group 的 change 事件,detail.value 为已选中项数组
+		 * 返回:无;把 genTemplate 写成 1/0,提交时带给后端决定是否复制模板
+		 */
+		genTemplateItem(e){
+			this.genTemplate = e.detail.value && e.detail.value.length > 0 ? 1 : 0
+		},
     requestAuthCode(){
       let that = this
       let mobile = this.form.mobile
@@ -625,7 +650,8 @@ export default {
         from: from,
         miniOpenId: currentMiniOpenId,
         appRegister: appRegister,
-        fillMobile: this.fillMobile
+        fillMobile: this.fillMobile,
+        genTemplate: this.genTemplate
       }).then(subRes => {
         uni.hideLoading()
         let token = subRes.data.token || ''
@@ -863,6 +889,10 @@ export default {
   padding: 0 8upx;
 }
 
+.apply-template {
+  margin-top: 8upx;
+}
+
 .apply-agreement-label {
   display: flex;
   flex-direction: row;