shish 4 лет назад
Родитель
Сommit
29239e513f

+ 4 - 4
ghs/vue.config.js

@@ -3,7 +3,7 @@ const path = require('path');
 const isProduction = process.env.NODE_ENV === 'production';
 
 //http和https切换请修改这里,修改后需要重新运行npm run serve shish 2021.4.12
-const proxyTarget = 'http://api.shop.hzghd.com';
+const proxyTarget = 'https://api.shop.wixhb.com';
 
 function resolve(dir) {
 	return path.join(__dirname, dir);
@@ -14,11 +14,11 @@ function resolve(dir) {
  * **/
 let hostUrl = ``;
 if(process.env.NODE_ENV == 'development'){
-	hostUrl = `http://img.hzghd.com/`;
+	hostUrl = `https://img.wixhb.com/`;
 }else if(process.env.NODE_ENV == 'local'){
-	hostUrl = `http://img.hzghd.com/`;
+	hostUrl = `https://img.wixhb.com/`;
 }else{
-	hostUrl = `https://img.hzghd.com/`;
+	hostUrl = `https://img.wixhb.com/`;
 }
 
 const cdn = {

+ 6 - 6
ghsApp/src/ext.json

@@ -1,12 +1,12 @@
 {
   "extEnable": true,
-  "extAppid": "wx21b7c3ef12082099",
+  "extAppid": "wxcf32b3f0684c2433",
   "directCommit": false,
   "ext": {
-    "account": 12362,
-    "apiHost": "https://api.shop.hzghd.com",
-    "socketApiHost": "api.shop.hzghd.com",
-    "imgHost": "https://img.hzghd.com",
-    "name":"花掌柜"
+    "account": 12358,
+    "apiHost": "https://api.shop.wixhb.com",
+    "socketApiHost": "api.shop.wixhb.com",
+    "imgHost": "https://img.wixhb.com",
+    "name":"销花宝"
   }
 }

+ 7 - 1
ghsApp/src/manifest.json

@@ -83,15 +83,21 @@
     "quickapp" : {},
     /* 小程序特有相关 线上(销花宝) wxcf32b3f0684c2433 开发(花掌柜) wx21b7c3ef12082099 */
     "mp-weixin" : {
-        "appid" : "wx21b7c3ef12082099",
+        "appid" : "wxcf32b3f0684c2433",
         "setting" : {
             "urlCheck" : false
         },
+		"optimization" : {
+			"subPackages" : true
+		},
         "usingComponents" : true,
         "permission" : {
             "scope.userLocation" : {
                 "desc" : "请点击确定"
             }
+        },
+        "optimization": {  
+            "subPackages": true  
         }
     },
     "mp-alipay" : {

+ 1 - 0
ghsApp/src/pagesClient/member/detail.vue

@@ -45,6 +45,7 @@
                 <view>
                   {{userInfo.name}} {{userInfo.mobile}}
                 </view>
+                <view style="margin-bottom:14rpx;color:#333333">店长:{{userInfo.superInfo.name}}</view>
                 <view>
                   {{userInfo.address}}
                 </view>

+ 5 - 1
ghsApp/src/pagesOrder/refund.vue

@@ -221,8 +221,12 @@ export default {
 				confirmText: "确认",
 				success: function (res) {
 					if (res.confirm) {
+						uni.showLoading({title: "提交中"})
 						refund(parameter).then(res => {
-							uni.navigateTo({url:'/common/pageSuccess?title=操作成功'})
+							if(res.code == 1){
+								uni.hideLoading()
+								uni.navigateTo({url:'/common/pageSuccess?title=操作成功'})
+							}
 						})
 					}
 				},

+ 6 - 6
ghsApp/src/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.eot');
-  src: url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
-  url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
-  url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
-  url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
-  url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
+  src: url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.eot');
+  src: url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
+  url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
+  url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
+  url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
+  url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
 }
 
 .iconfont {

+ 4 - 4
hd/vue.config.js

@@ -3,7 +3,7 @@ const path = require('path');
 const isProduction = process.env.NODE_ENV === 'production';
 
 //http和https切换请修改这里,修改后需要重新运行npm run serve shish 2021.4.12
-const proxyTarget = 'http://api.shop.huaml.com';
+const proxyTarget = 'https://api.shop.huahb.cn';
 
 function resolve(dir) {
 	return path.join(__dirname, dir);
@@ -11,11 +11,11 @@ function resolve(dir) {
 
 let hostUrl = ``;
 if(process.env.NODE_ENV == 'development'){
-	hostUrl = `http://img.huaml.com/`;
+	hostUrl = `https://img.huahb.cn/`;
 }else if(process.env.NODE_ENV == 'local'){
-	hostUrl = `http://img.huaml.com/`;
+	hostUrl = `https://img.huahb.cn/`;
 }else{
-	hostUrl = `https://img.huaml.com/`;
+	hostUrl = `https://img.huahb.cn/`;
 }
 const cdn = {
 	dev: {

+ 5 - 0
hdApp/src/api/purchase/refund.js

@@ -0,0 +1,5 @@
+import https from "@/plugins/luch-request_0.0.7/request";
+
+export const getRefundData = async data => {
+	return https.get("/cg-refund/get-refund-data", data);
+};

+ 6 - 6
hdApp/src/ext.json

@@ -1,12 +1,12 @@
 {
   "extEnable": true,
-  "extAppid": "wxe4675bab299a52f7",
+  "extAppid": "wx0d42f5f1dcb3a370",
   "directCommit": false,
   "ext": {
-    "account": 12362,
-    "apiHost": "https://api.shop.huaml.com",
-    "socketApiHost": "api.shop.huaml.com",
-    "imgHost": "https://img.huaml.com",
-    "name":"花美玲"
+    "account": 12358,
+    "apiHost": "https://api.shop.huahb.cn",
+    "socketApiHost": "api.shop.huahb.cn",
+    "imgHost": "https://img.huahb.cn",
+    "name":"花惠宝"
   }
 }

+ 1 - 1
hdApp/src/manifest.json

@@ -84,7 +84,7 @@
     "quickapp" : {},
     /* 小程序特有相关 线上(花惠宝) wx0d42f5f1dcb3a370 开发(花美玲) wxe4675bab299a52f7 */
     "mp-weixin" : {
-        "appid" : "wxe4675bab299a52f7",
+        "appid" : "wx0d42f5f1dcb3a370",
         "setting" : {
             "urlCheck" : false
         },

+ 7 - 0
hdApp/src/pages.json

@@ -898,6 +898,13 @@
 						"navigationBarTitleText": "选择小菊颜色",
 						"enablePullDownRefresh": true
 					}
+				},
+				{
+					"path": "refundDetail",
+					"style": {
+						"navigationBarTitleText": "退款详情",
+						"enablePullDownRefresh": true
+					}
 				}
 			]
 		},

+ 3 - 0
hdApp/src/pagesPurchase/purDetails.vue

@@ -67,6 +67,9 @@
         <view v-if="detailInfo.refund == 2" class="order-info_box">
           <view>退款金额:</view>
           <view style="color:red;font-weight:bold;font-size:30rpx;">{{detailInfo.tkPrice}}</view>
+            <view class="price" v-if="detailInfo.refund == 2">
+              <button @click="pageTo({url: '/pagesPurchase/refundDetail',query: {id: detailInfo.id}})" class="admin-button-com">退款明细</button>
+            </view>
         </view>
         <view v-if="detailInfo.refund == 2" class="order-info_box">
           <view>退款方式:</view>

+ 379 - 0
hdApp/src/pagesPurchase/refundDetail.vue

@@ -0,0 +1,379 @@
+<template>
+  <view class="app-content">
+    <view class="info-content_box">
+      <view class="module-com content-box proInfo">
+        <view class="commodity-view">
+          <view class="infoAEdit">
+            <text>退款花材</text>
+          </view>
+          <view class="commodity-list">
+            <view
+              v-for="(s, idx) in refundData.itemList"
+              :key="idx"
+              class="commodity-item"
+            >
+              <image
+                class="item-icon"
+                :src="s.cover"
+                alt=""
+              />
+              <view class="item-info">
+                <view class="info-line">
+                  <text class="item-name">{{ s.name }}</text>
+                  <text class="item-price">
+                    <text class="unit"></text>
+                    <text class="price"><text>{{s.itemNum}}扎*{{s.itemPrice}}</text></text>
+                  </text>
+                </view>
+                <view class="info-line">
+                  <text class="item-type"></text>
+                  <text class="item-count">¥{{ s.totalPrice }}</text>
+                </view>
+              </view>
+            </view>
+          </view>
+          <view class="summary-bar">
+            <view class="operate-view"></view>
+            <view class="describe-view">
+              合计 ¥<text class="price">{{ refundData.info.refundPrice }}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+      <view v-if="detailInfo.remark !=''" class="content-box price-detail">
+        <div class="module-com input-line-wrap">
+          <tui-list-cell
+            class="line-cell"
+            :hover="false"
+          >
+            <div class="tui-title">备注</div>
+            <input
+              :disabled="true"
+              v-model="refundData.info.remark"
+              placeholder-class="phcolor"
+              class="tui-input"
+              name="name"
+              maxlength="50"
+              type="text"
+            />
+          </tui-list-cell>
+        </div>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import { getRefundData} from "@/api/purchase/refund";
+import TuiListCell from "@/components/plugin/list-cell";
+export default {
+  name: "refundDetail",
+  components: {
+    TuiListCell
+  },
+  data () {
+    return {
+      refundData:{}
+    };
+  },
+  onShow () {
+
+  },
+  onPullDownRefresh() {
+			this.initData().then(res => {
+				uni.stopPullDownRefresh()
+			})
+		},
+  methods: {
+    init() {
+      this.initData()
+    },
+    async initData () {
+      return getRefundData({ cgId: this.option.id }).then(res => {
+        this.refundData = res.data
+        this.$forceUpdate()
+      })
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.info-content_box {
+  padding: 0 20px 100px;
+  & > .title {
+    color: #666666;
+    font-size: 28px;
+    font-weight: 600;
+    padding: 30px 3px;
+  }
+  & .address-des_bx {
+    display: flex;
+    padding: 20px 10px 30px 20px;
+    & > view:nth-child(1) {
+      flex: 1;
+      margin-top: 10px;
+      & > view:nth-child(1) {
+        color: #333333;
+        font-size: 32px;
+        font-weight: bold;
+      }
+      & > view:nth-child(2) {
+        color: #666666;
+        font-size: 28px;
+        font-weight: 400;
+        margin-top: 20px;
+      }
+    }
+    & > view:nth-child(2) {
+      display: flex;
+      & .icondianhua1 {
+        font-size: 50px;
+        color: #3385ff;
+        margin-left: 0px;
+      }
+    }
+  }
+  .bills-info_box {
+    margin-top: 20upx;
+    padding: 30px 20px 30px;
+    & > .order-info_box {
+      display: flex;
+      align-items: center;
+      font-size: 26px;
+      font-weight: 400;
+      margin-bottom: 5px;
+      & > view:nth-child(1) {
+        color: #999999;
+        width: 135px;
+        text-align: right;
+      }
+      & > view:nth-child(2) {
+        color: #333333;
+      }
+      & > .price {
+        flex: 1;
+        font-size: 30px;
+        color: #333333;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+        & .iconxiangyou {
+          color: #999999;
+          font-size: 25px;
+          margin-left: 12px;
+        }
+      }
+    }
+  }
+  .content-box {
+    background-color: #ffffff;
+    border-radius: 10px;
+  }
+  .commodity-view {
+    display: flex;
+    flex-direction: column;
+    .commodity-list {
+      padding: 20px;
+      .commodity-item {
+        display: flex;
+        margin-bottom: 20px;
+        .item-icon {
+          flex-shrink: 0;
+          width: 140px;
+          height: 140px;
+        }
+        .item-info {
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+          flex: 1;
+          margin-left: 20px;
+          .info-line {
+            margin-bottom: 20px;
+            display: flex;
+            justify-content: space-between;
+            align-items: flex-end;
+            .item-name {
+              color: #666;
+              font-size: 30px;
+              font-weight: 700;
+            }
+            .item-price {
+              color: #333;
+              font-size: 22px;
+              .price {
+                font-size: 30px;
+                font-weight: bold;
+              }
+            }
+            .item-type {
+              color: #999;
+              font-size: 24px;
+            }
+            .item-count {
+              color: #666;
+              font-size: 24px;
+            }
+          }
+        }
+      }
+    }
+    .summary-bar {
+      padding: 0 20px;
+      height: 90px;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      border-top: 1px solid #eeeeee;
+      .operate-view {
+        display: flex;
+        align-items: center;
+        color: #3385ff;
+        font-size: 26px;
+        .iconfont {
+          margin-right: 20px;
+          font-size: 40px;
+        }
+      }
+      .describe-view {
+        display: flex;
+        align-items: center;
+        color: #333;
+        font-size: 24px;
+        .price {
+          font-weight: bold;
+          font-size: 36px;
+        }
+      }
+    }
+  }
+  .shipping-address {
+    display: flex;
+    align-items: center;
+    margin-top: 20px;
+    & > view:nth-child(1) {
+      color: #999999;
+      font-size: 28upx;
+      font-weight: 400;
+      display: inline-block;
+      padding: 30upx 0 30upx 20upx;
+      flex: 1;
+      & > text {
+        color: #333333;
+        font-weight: 600;
+      }
+    }
+    & > view:nth-child(2) {
+      font-size: 60px;
+      color: #d6e7ff;
+      margin-right: 10px;
+    }
+  }
+  .price-detail {
+    margin-top: 20px;
+    margin-bottom: 20px;
+  }
+  .detail-price_box {
+    color: #333333;
+    font-size: 22px;
+    text-align: right;
+    flex: 1;
+    font-weight: 600;
+    &.red {
+      color: #ff2842;
+    }
+  }
+}
+.app-footer {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  & .admin-button-com {
+    padding: 0;
+    margin-right: 15px;
+    width: 140px;
+    height: 70px;
+    line-height: 70px;
+    text-align: center;
+    color: #3385ff;
+    border: 1px solid #3385ff;
+    &.active {
+      color: #666666;
+      border: 1px solid #ccc;
+    }
+  }
+}
+.proInfo {
+  margin-top: 20upx;
+}
+.infoAEdit {
+  display: flex;
+  justify-content: space-between;
+  height: 60upx;
+  line-height: 80upx;
+  font-size: 28;
+  font-weight: 700;
+  color: #666;
+  padding: 0 20upx;
+  .iconfont {
+    margin-right: 15px;
+    font-size: 30px;
+  }
+  & > .editFlr {
+    position: relative;
+    color: #1890f3;
+    font-size: 26upx;
+    &:after {
+      content: "";
+      position: absolute;
+      left: 0;
+      top: 0;
+    }
+  }
+}
+.footer_bar {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100vw;
+  padding: 15upx 0;
+  background: #fff;
+  line-height: 100upx;
+  border-top: 1px solid #ddd;
+  z-index: 10;
+  & > view {
+    float: right;
+    height: 70upx;
+    display: inline-block;
+    padding: 0 50upx;
+    background: #3385ff;
+    margin-right: 20upx;
+    border-radius: 8px;
+    line-height: 70upx;
+    text-align: center;
+    font-size: 32upx;
+    color: #fff;
+  }
+}
+.distribution {
+  line-height: 80upx;
+  padding: 0 40upx 0 20upx;
+  display: flex;
+  justify-content: space-between;
+  .evolve {
+    position: relative;
+    &::after {
+      content: "";
+      position: absolute;
+      top: 50%;
+      right: -20upx;
+      transform: translateY(-50%) rotate(225deg);
+      width: 10upx;
+      height: 10upx;
+      border-left: 1px solid #ddd;
+      border-bottom: 1px solid #ddd;
+    }
+  }
+}
+</style>

+ 6 - 6
hdApp/src/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot');
-  src: url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
-  url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
-  url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
-  url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
-  url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
+  src: url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.eot');
+  src: url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
+  url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
+  url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
+  url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
+  url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
 }
 
 .iconfont {

+ 5 - 5
mallApp/src/ext.json

@@ -1,12 +1,12 @@
 {
   "extEnable": true,
-  "extAppid": "wxe41bd5816affd0ba",
+  "extAppid": "wx99a1dfc4171efb42",
   "directCommit": false,
   "ext": {
     "account": 0,
-    "apiHost": "https://api.shop.theflorist.cn",
-    "socketApiHost": "api.shop.theflorist.cn",
-    "imgHost": "https://img.theflorist.cn",
-    "name":"花卉"
+    "apiHost": "https://api.shop.zhiguanhua.cn",
+    "socketApiHost": "api.shop.zhiguanhua.cn",
+    "imgHost": "https://img.zhiguanhua.cn",
+    "name":"花卉"
   }
 }

+ 1 - 1
mallApp/src/manifest.json

@@ -83,7 +83,7 @@
     "quickapp" : {},
     /* 小程序特有相关 线上(花卉宝) wx99a1dfc4171efb42 开发(中花卉) wxe41bd5816affd0ba */
     "mp-weixin" : {
-        "appid" : "wxe41bd5816affd0ba",
+        "appid" : "wx99a1dfc4171efb42",
         "setting" : {
             "urlCheck" : false
         },

+ 6 - 6
mallApp/src/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.eot');
-  src: url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.eot?#iefix') format('embedded-opentype'),
-  url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.woff2') format('woff2'),
-  url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.woff') format('woff'),
-  url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.ttf') format('truetype'),
-  url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.svg#iconfont') format('svg');
+  src: url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.eot');
+  src: url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.eot?#iefix') format('embedded-opentype'),
+  url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.woff2') format('woff2'),
+  url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.woff') format('woff'),
+  url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.ttf') format('truetype'),
+  url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.svg#iconfont') format('svg');
 }
 
 .iconfont {

+ 4 - 4
pt/vue.config.js

@@ -4,7 +4,7 @@ const isProduction = process.env.NODE_ENV === 'production';
 
 //http和https切换请修改这里,修改后需要重新运行 npm run serve 即可 shish 2021.4.12
 const proxyTarget =
-	process.env.NODE_ENV == 'local' ? 'http://api.pt.huaml.com' : 'http://api.pt.huaml.com';
+	process.env.NODE_ENV == 'local' ? 'https://api.pt.wixhb.com' : 'https://api.pt.wixhb.com';
 
 function resolve(dir) {
 	return path.join(__dirname, dir);
@@ -15,11 +15,11 @@ function resolve(dir) {
  * **/
 let hostUrl = ``;
 if(process.env.NODE_ENV == 'development'){
-	hostUrl = `http://img.hzghd.com/`;
+	hostUrl = `http://img.wixhb.com/`;
 }else if(process.env.NODE_ENV == 'local'){
-	hostUrl = `http://img.hzghd.com/`;
+	hostUrl = `http://img.wixhb.com/`;
 }else{
-	hostUrl = `https://img.hzghd.com/`;
+	hostUrl = `https://img.wixhb.com/`;
 }
 
 const cdn = {