选择按钮调大

ghsApp/src/admin/billing/affirm.vue

@@ -58,7 +58,7 @@
 						<view class="tui-placeholder" style="width: 100%" v-else @click="showCustomer = true">请选择客户</view>
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
-						<view class="tui-title ">取货</view>
+						<view class="tui-title ">送货</view>
 						<button @tap="form.sendType=2" class="admin-button-com mini-btn" :class="form.sendType==2?'blue':'default'">自取</button>
 						<button @click="form.sendType=1" class="admin-button-com mini-btn" :class="form.sendType==1?'blue':'default'">配送</button>
 					</tui-list-cell>

ghsApp/src/admin/home/me.vue

@@ -107,8 +107,17 @@
               :hover="false"
               :arrow="true"
             >
-              <div class="tui-title">提现帐号设置</div>
+              <div class="tui-title">提现帐号</div>
             </tui-list-cell>
+            <tui-list-cell
+              @click="pageTo({ url: '/pagesStore/me/expressSet' })"
+              class="line-cell"
+              :hover="false"
+              :arrow="true"
+            >
+              <div class="tui-title">快递设置</div>
+            </tui-list-cell>
+
           </view>
         </view>
       </view>
@@ -207,18 +216,7 @@ export default {
       }
     },
     async applyCash() {
-      uni.showLoading({
-        title: "加载中",
-      });
-      try {
         const { data } = await applyCash({});
-        uni.showToast({
-          title: "提现成功",
-          duration: 2000,
-        });
-      } finally {
-        uni.hideLoading();
-      }
     },
     _list() {},
   },

ghsApp/src/admin/home/order.vue

@@ -84,7 +84,6 @@
               </view>
             </view>
           </view>
-          <!--					<div 						v-if="!$util.isEmpty(item.buttonList.filter(r => r.disable == 1))"  class="list-bottom" >-->
           <div class="list-bottom">
             <div class="list-button">
               <view v-for="s in item.buttonList" :key="s.type">

ghsApp/src/api/home/index.js

@@ -1,8 +1,6 @@
 import https from '@/plugins/luch-request_0.0.7/request'
 
-/** *
- * 首页 m
- */
+//首页
 export const getMainIndex = data => {
 	return https.get('/main/index', data)
 }
@@ -10,6 +8,8 @@ export const getMainIndex = data => {
 export const mainMy = async (data) => {
 	return https.get("/main/my", data);
 };
+
+//提现申请
 export const applyCash = async (data) => {
 	return https.get("/cash/apply", data);
 };

ghsApp/src/api/shop-express/index.js

@@ -0,0 +1,11 @@
+import https from '@/plugins/luch-request_0.0.7/request'
+
+//达达信息
+export const dadaInfo = data => {
+	return https.get('/shop-express/dada-info', data)
+}
+
+//更新达达
+export const updateDada = data => {
+	return https.get('/shop-express/update-dada', data)
+}

ghsApp/src/components/module/app-commodity.vue

@@ -153,7 +153,7 @@ export default {
 				& .iconfont {
 					//margin-left: 15rpx;
 					color: #3385ff;
-					font-size: 30px;
+					font-size: 46px;
 				}
 				.position{
 					display: block;
@@ -175,7 +175,7 @@ export default {
 					color: #5C5C5C;
 					border-radius: 22px;
 					background-color: #f5f5f5;
-					padding: 10px 0;
+					padding: 6px 0;
 					font-size: 32rpx;
 				}
 				.change-input {

ghsApp/src/pages.json

@@ -170,7 +170,8 @@
 				{"path": "me/incomeExpenses","style": {"navigationBarTitleText": "收支记录"}},
 				{"path": "me/recharge","style": {"navigationBarTitleText": "充值"}},
 				{"path": "me/rechargeList","style": {"navigationBarTitleText": "充值记录"}},
-				{"path": "me/cashSet","style": {"navigationBarTitleText": "提现帐号设置"}},
+				{"path": "me/cashSet","style": {"navigationBarTitleText": "提现帐号"}},
+				{"path": "me/expressSet","style": {"navigationBarTitleText": "快递设置"}},
 				{"path": "me/rechargeSuccess","style": {"navigationBarTitleText": "充值成功"}}
 			]
 		},

ghsApp/src/pagesStore/me/expressSet.vue

@@ -0,0 +1,155 @@
+<template>
+  <div class="app-content">
+    <div v-show="showStaffArea">
+      <form @submit="formSubmit" @reset="formReset">
+        <div class="module-com input-line-wrap">
+          <tui-list-cell class="line-cell" :hover="false">
+            <div class="tui-title required">达达商户ID</div>
+            <input
+              v-model="form.sjId"
+              placeholder-class="phcolor"
+              class="tui-input"
+              name="sjId"
+              placeholder="请输入商户ID"
+              maxlength="50"
+              type="text"
+            />
+          </tui-list-cell>
+
+          <tui-list-cell class="line-cell" :hover="false">
+            <div class="tui-title required">达达门店编号</div>
+            <input
+              v-model="form.shopNo"
+              placeholder-class="phcolor"
+              class="tui-input"
+              name="shopNo"
+              placeholder="请输入编号"
+              maxlength="50"
+              type="text"
+            />
+          </tui-list-cell>
+        </div>
+
+        <!-- 提交 -->
+        <div class="confirm-btn">
+          <button class="admin-button-com big blue" formType="submit">
+            提交
+          </button>
+        </div>
+      </form>
+    </div>
+  </div>
+</template>
+
+<script>
+import TuiListCell from "@/components/plugin/list-cell";
+import AppAvatarModule from "@/components/module/app-avatar";
+const form = require("@/utils/formValidation.js");
+import { dadaInfo,updateDada } from "@/api/shop-express";
+export default {
+  name: "expressSet",
+  components: {
+    TuiListCell,
+    AppAvatarModule,
+  },
+  data() {
+    return {
+      form: {
+        shopNo: "",
+        sjId: "",
+      },
+      roleList: [],
+      roleSelData: {},
+      showStaffArea: true,
+      miniCodeSrc: "",
+      memberData: {},
+    };
+  },
+  onLoad() {
+  },
+  onShow() {
+    uni.setNavigationBarTitle({
+      title: `快递设置`,
+    });
+  },
+  methods: {
+    async init() {
+      try {
+        const { data } = await dadaInfo();
+        this.form.shopNo = data.shopNo;
+        this.form.sjId = data.sjId;
+        this.$forceUpdate();
+      } finally {
+      }
+    },
+    confirmFn() {
+      updateDada(this.form).then((res) => {
+        this.$msg("操作成功");
+        setTimeout(() => {
+          uni.navigateBack();
+        }, 1300)
+      });
+    },
+    formSubmit(e) {
+      // 表单验证
+      let rules = [
+        {
+          name: "sjId",
+          rule: ["required"],
+          msg: ["请输入商户ID"],
+        },
+        {
+          name: "shopNo",
+          rule: ["required"],
+          msg: ["请输入门店编号"],
+        },
+      ];
+      // 进行表单检查
+      let formData = e.detail.value;
+      let checkRes = form.validation(formData, rules);
+      // 验证通过!
+      if (!checkRes) {
+        this.confirmFn();
+      } else {
+        this.$msg(checkRes);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.app-content {
+  min-height: calc(100vh - 20px);
+  padding-top: 20px;
+}
+.prompt-text {
+  color: $fontColor3;
+  padding-left: 30px;
+  margin-bottom: 30px;
+}
+// ---
+.module-com {
+  margin-bottom: 20px;
+  .member-wrap {
+    .member-det {
+      font-size: 24px;
+      margin-left: 20px;
+    }
+  }
+  .remark-wrap {
+    align-items: flex-start;
+    .remark {
+      height: 240px;
+    }
+  }
+}
+// 按钮
+.confirm-btn {
+  width: calc(100% - 60px);
+  margin: 60px 30px 20px;
+  .admin-button-com {
+    width: 100%;
+  }
+}
+</style>

ghsApp/src/pagesStore/me/recharge.vue

@@ -123,7 +123,7 @@ export default {
       });
     },
     payFail() {
-      this.$msg("没有充值成功哦");
+      this.$msg("没有充值成功");
       return false;
     },
   },

ghsApp/src/pagesStorehouse/flower/category.vue

@@ -34,6 +34,7 @@
 							</t-td>
 						</t-tr>
 					</t-table>
+					
 				</block>
 				<block v-else>
 					<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />

ghsApp/src/pagesStorehouse/flower/manage.vue

@@ -10,16 +10,15 @@
 							</t-th>
 						</t-tr>
 						<t-tr v-for="(item, index) in list.data" :key="item.id">
-							<t-td v-for="(column, colIndex) in columns" :key="colIndex" :align="column.align" :color="column.color" >
-								<view v-if="column.custom == 'edit'" class="edit-td">
-									<text v-if="!isRank" class="iconfont iconxiangyou" @click.stop="editEvent(item, index)" style="font-size: 20rpx"></text>
-								</view>
-								<view v-else @click.stop="editEvent(item, index)" style="width:600rpx;text-align:left;">
-									{{ item[column.dataIndex] || "" }}
+							<t-td>
+								<view @click.stop="editEvent(item, index)" class="item">
+									<view>{{ item.name }}</view> 
 								</view>
+								<i @click.stop="editEvent(item, index)" class="iconfont iconxiangyou"></i>
 							</t-td>
 						</t-tr>
 					</t-table>
+					<view class='update_hint'>提示：修改花材请在电脑上操作。</view>
 				</block>
 				<block v-else>
 					<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
@@ -113,18 +112,6 @@ export default {
 				})
 				.catch(err => {});
 		},
-		// upSortByIndex(index) {
-		// 	if (index > 0) {
-		// 		const delItem = this.dataList.splice(index, 1, this.dataList[index - 1]);
-		// 		this.$set(this.dataList, index - 1, delItem[0]);
-		// 	}
-		// },
-		// downSortByIndex(index) {
-		// 	if (index < this.dataList.length - 1) {
-		// 		const delItem = this.dataList.splice(index, 1, this.dataList[index + 1]);
-		// 		this.$set(this.dataList, index + 1, delItem[0]);
-		// 	}
-		// },
 		async upSortByIndex(item, index) {
 			if (index == 0) {
 				return;
@@ -278,6 +265,16 @@ export default {
 		background-color: #f9fbfc;
 		.space-view {
 			background-color: #fff;
+			.update_hint{
+				color:#999999;
+				margin:30rpx 30rpx;
+			}
+			.item{
+				width:100%;
+				text-align:left;
+				height:50rpx;
+				padding-top:8rpx;
+			}
 		}
 		.ex-info {
 			padding: 30upx;